ci-operator/templates/openshift/installer/cluster-launch-installer-up…

…i*: WorkerSubnet for 4.1 456f258 (ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: WorkerSubnet -> Subnet, 2019-06-09, #4013) does not apply to 4.1. Switch on BRANCH to use the old WorkerSubnet for 4.1.
openshift · Dec 5, 2019 · 545d327 · 545d327
1 parent 4972b87
commit 545d327
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
@@ -1511,14 +1511,18 @@ objects:
           for INDEX in 0 1 2
           do
             SUBNET="PRIVATE_SUBNET_${INDEX}"
+            case "${BRANCH}" in
+            4.1) SUBNET_KEY=WorkerSubnet;;
+            *) SUBNET_KEY=Subnet;;
+            esac
             aws cloudformation create-stack \
               --stack-name "${CLUSTER_NAME}-compute-${INDEX}" \
               --template-body "$(cat "/var/lib/openshift-install/upi/${CLUSTER_TYPE}/cloudformation/06_cluster_worker_node.yaml")" \
               --tags "${TAGS}" \
               --parameters \
                 ParameterKey=InfrastructureName,ParameterValue="${INFRA_ID}" \
                 ParameterKey=RhcosAmi,ParameterValue="${RHCOS_AMI}" \
-                ParameterKey=Subnet,ParameterValue="${!SUBNET}" \
+                ParameterKey="${SUBNET_KEY},ParameterValue=${!SUBNET}" \
                 ParameterKey=WorkerSecurityGroupId,ParameterValue="${WORKER_SECURITY_GROUP}" \
                 ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${base_domain}:22623/config/worker" \
                 ParameterKey=CertificateAuthorities,ParameterValue="${IGNITION_CA}" \

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
@@ -728,14 +728,18 @@ objects:
           for INDEX in 0 1 2
           do
             SUBNET="PRIVATE_SUBNET_${INDEX}"
+            case "${BRANCH}" in
+            4.1) SUBNET_KEY=WorkerSubnet;;
+            *) SUBNET_KEY=Subnet;;
+            esac
             aws cloudformation create-stack \
               --stack-name "${CLUSTER_NAME}-compute-${INDEX}" \
               --template-body "$(cat "/var/lib/openshift-install/upi/${CLUSTER_TYPE}/cloudformation/06_cluster_worker_node.yaml")" \
               --tags "${TAGS}" \
               --parameters \
                 ParameterKey=InfrastructureName,ParameterValue="${INFRA_ID}" \
                 ParameterKey=RhcosAmi,ParameterValue="${RHCOS_AMI}" \
-                ParameterKey=Subnet,ParameterValue="${!SUBNET}" \
+                ParameterKey="${SUBNET_KEY},ParameterValue=${!SUBNET}" \
                 ParameterKey=WorkerSecurityGroupId,ParameterValue="${WORKER_SECURITY_GROUP}" \
                 ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${base_domain}:22623/config/worker" \
                 ParameterKey=CertificateAuthorities,ParameterValue="${IGNITION_CA}" \