Skip to content

WIP [FCOS] vSphere: update UPI files to tf 1.12 #2953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdodson merged 3 commits into from
Jan 21, 2020
Merged

WIP [FCOS] vSphere: update UPI files to tf 1.12 #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a2eb31
Dockerfile.upi: fix terraform-ignition bin path
Jan 20, 2020
80d1fbe
vsphere: require terraform-plugin-ignition v2.0.0
Jan 21, 2020
361c90f
vsphere: use terraform 0.11.11
Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions images/installer/Dockerfile.upi.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ 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
RUN curl -L -O https://github.com/poseidon/terraform-provider-matchbox/releases/download/${MATCHBOX_VERSION}/terraform-provider-matchbox-${MATCHBOX_VERSION}-linux-amd64.tar.gz && \
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
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
Expand Down
8 changes: 4 additions & 4 deletions upi/vsphere/machine/ignition.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
provider "ignition" {
version = "1.1.0"
version = "2.0.0"
}

locals {
Expand Down Expand Up @@ -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]}",
]
}