From 1a2eb31e842389ab12163039b30af8ccf0782481 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 20 Jan 2020 22:29:54 +0100 Subject: [PATCH 1/3] Dockerfile.upi: fix terraform-ignition bin path --- images/installer/Dockerfile.upi.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index 28e2fbe7af4..f2f2d4ab7e7 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -34,7 +34,7 @@ RUN curl -L -O https://github.com/poseidon/terraform-provider-matchbox/releases/ tar xzf terraform-provider-matchbox-${MATCHBOX_VERSION}-linux-amd64.tar.gz && \ mv terraform-provider-matchbox-${MATCHBOX_VERSION}-linux-amd64/terraform-provider-matchbox /bin/terraform-provider-matchbox RUN curl -L -O https://github.com/LorbusChris/terraform-provider-ignition/raw/v2-bin-1/terraform-provider-ignition && \ - mv terraform-provider-ignition-2 /bin/terraform-provider-ignition + mv terraform-provider-ignition /bin/terraform-provider-ignition RUN curl -L -O https://github.com/vmware/govmomi/releases/download/v0.21.0/govc_linux_amd64.gz && \ gzip -d govc_linux_amd64.gz && \ chmod +x govc_linux_amd64 && mv govc_linux_amd64 /bin/govc From 80d1fbe367813c53664fdb0f6f6f6e4e1b3dcb9c Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 21 Jan 2020 11:53:49 +0100 Subject: [PATCH 2/3] vsphere: require terraform-plugin-ignition v2.0.0 Use LorbusChris fork and rename binary to match terraform 0.12 expectations --- images/installer/Dockerfile.upi.ci | 3 ++- upi/vsphere/machine/ignition.tf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index f2f2d4ab7e7..b03eea31308 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -34,7 +34,8 @@ RUN curl -L -O https://github.com/poseidon/terraform-provider-matchbox/releases/ tar xzf terraform-provider-matchbox-${MATCHBOX_VERSION}-linux-amd64.tar.gz && \ mv terraform-provider-matchbox-${MATCHBOX_VERSION}-linux-amd64/terraform-provider-matchbox /bin/terraform-provider-matchbox RUN curl -L -O https://github.com/LorbusChris/terraform-provider-ignition/raw/v2-bin-1/terraform-provider-ignition && \ - mv terraform-provider-ignition /bin/terraform-provider-ignition + chmod +x terraform-provider-ignition && \ + mv terraform-provider-ignition /bin/terraform-provider-ignition_v2.0.0 RUN curl -L -O https://github.com/vmware/govmomi/releases/download/v0.21.0/govc_linux_amd64.gz && \ gzip -d govc_linux_amd64.gz && \ chmod +x govc_linux_amd64 && mv govc_linux_amd64 /bin/govc diff --git a/upi/vsphere/machine/ignition.tf b/upi/vsphere/machine/ignition.tf index b88b600a1b1..65a400a7a77 100644 --- a/upi/vsphere/machine/ignition.tf +++ b/upi/vsphere/machine/ignition.tf @@ -1,5 +1,5 @@ provider "ignition" { - version = "1.1.0" + version = "2.0.0" } locals { From 361c90fd25aea68751e5e6cdf7b8dd285a638ce8 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 21 Jan 2020 14:11:51 +0100 Subject: [PATCH 3/3] vsphere: use terraform 0.11.11 --- images/installer/Dockerfile.upi.ci | 2 +- upi/vsphere/machine/ignition.tf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index b03eea31308..7edae04f3f3 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -26,7 +26,7 @@ RUN yum install --setopt=tsflags=nodocs -y \ yum clean all && rm -rf /var/cache/yum/* && \ chmod g+w /etc/passwd -ENV TERRAFORM_VERSION=0.12.19 +ENV TERRAFORM_VERSION=0.11.11 RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \ unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /bin/ ENV MATCHBOX_VERSION=v0.3.0 diff --git a/upi/vsphere/machine/ignition.tf b/upi/vsphere/machine/ignition.tf index 65a400a7a77..a2e4754f051 100644 --- a/upi/vsphere/machine/ignition.tf +++ b/upi/vsphere/machine/ignition.tf @@ -72,11 +72,11 @@ data "ignition_config" "ign" { } systemd = [ - "${data.ignition_systemd_unit.restart.*.id[count.index]}", + "${data.ignition_systemd_unit.restart.*.rendered[count.index]}", ] files = [ - "${data.ignition_file.hostname.*.id[count.index]}", - "${data.ignition_file.static_ip.*.id[count.index]}", + "${data.ignition_file.hostname.*.rendered[count.index]}", + "${data.ignition_file.static_ip.*.rendered[count.index]}", ] }