CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Omit -o flag to flatcar-install unless oem_type is defined

This commit is contained in:
Bill ONeill 2023-04-23 21:15:09 -04:00 committed by Dalton Hubble
parent fc444d25f8
commit 2272472d59
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bare-metal/flatcar-linux/kubernetes/butane/install.yaml
View File

@ -35,7 +35,7 @@ storage:
-d ${install_disk} \ -d ${install_disk} \
-C ${os_channel} \ -C ${os_channel} \
-V ${os_version} \ -V ${os_version} \
-o ${oem_type} \ ${oem_flag} \
${baseurl_flag} \ ${baseurl_flag} \
-i ignition.json -i ignition.json
udevadm settle udevadm settle

2
bare-metal/flatcar-linux/kubernetes/profiles.tf
View File

@ -55,7 +55,7 @@ data "ct_config" "install" {
mac = concat(var.controllers.*.mac, var.workers.*.mac)[count.index] mac = concat(var.controllers.*.mac, var.workers.*.mac)[count.index]
install_disk = var.install_disk install_disk = var.install_disk
ssh_authorized_key = var.ssh_authorized_key ssh_authorized_key = var.ssh_authorized_key
oem_type = var.oem_type oem_flag = var.oem_type != "" ? "-o ${var.oem_type}" : ""
# only cached profile adds -b baseurl # only cached profile adds -b baseurl
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : "" baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
}) })

2
bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml
View File

@ -35,7 +35,7 @@ storage:
-d ${install_disk} \ -d ${install_disk} \
-C ${os_channel} \ -C ${os_channel} \
-V ${os_version} \ -V ${os_version} \
-o ${oem_type} \ ${oem_flag} \
${baseurl_flag} \ ${baseurl_flag} \
-i ignition.json -i ignition.json
udevadm settle udevadm settle

2
bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf
View File

@ -50,7 +50,7 @@ data "ct_config" "install" {
mac = var.mac mac = var.mac
install_disk = var.install_disk install_disk = var.install_disk
ssh_authorized_key = var.ssh_authorized_key ssh_authorized_key = var.ssh_authorized_key
oem_type = var.oem_type oem_flag = var.oem_type != "" ? "-o ${var.oem_type}" : ""
# only cached profile adds -b baseurl # only cached profile adds -b baseurl
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : "" baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
}) })