Merge pull request #3285 from wking/explicit-aws-availability-zones

ci-operator/templates/openshift: Explicitly set AWS availability zones

Author: openshift-merge-robot

ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

@@ -237,6 +237,24 @@ objects:
         clusterID:  ${CLUSTER_ID}
         metadata:
           name: ${CLUSTER_NAME}
+        controlPlane:
+          name: master
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
         networking:
           clusterNetwork:
           - cidr: 10.128.0.0/14

ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

@@ -231,6 +231,24 @@ objects:
         clusterID:  ${CLUSTER_ID}
         metadata:
           name: ${CLUSTER_NAME}
+        controlPlane:
+          name: master
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
         networking:
           clusterNetwork:
           - cidr: 10.128.0.0/14

ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml

@@ -257,11 +257,24 @@ objects:
         apiVersion: v1beta4
         baseDomain: test.ose
         clusterID:  ${CLUSTER_ID}
+        controlPlane:
+          name: master
+          replicas: ${MASTERS}
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
         compute:
         - name: worker
           replicas: ${WORKERS}
-        controlPlane:
-        - replicas: ${MASTERS}
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
         metadata:
           name: ${CLUSTER_NAME}
         networking:

ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml

@@ -322,6 +322,24 @@ objects:
         clusterID:  ${CLUSTER_ID}
         metadata:
           name: ${CLUSTER_NAME}
+        controlPlane:
+          name: master
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1b
+              - us-east-1c
         networking:
           clusterNetwork:
           - cidr: 10.128.0.0/14