ci-operator/templates/openshift: Get e2e-aws out of us-east-1b

We're currently getting a lot of 500s there like [1]:

  time="2019-03-22T18:02:51Z" level=debug msg="2019-03-22T18:02:51.255Z [DEBUG] plugin.terraform-provider-aws: 2019/03/22 18:02:51 [DEBUG] [aws-sdk-go] DEBUG: Response ec2/RunInstances Details:"
  time="2019-03-22T18:02:51Z" level=debug msg="2019-03-22T18:02:51.255Z [DEBUG] plugin.terraform-provider-aws: ---[ RESPONSE ]--------------------------------------"
  time="2019-03-22T18:02:51Z" level=debug msg="2019-03-22T18:02:51.255Z [DEBUG] plugin.terraform-provider-aws: HTTP/1.1 500 Internal Server Error"

Looking at the results of this Athena query:

  SELECT *
  FROM "default"."cloudtrail_logs_cloud_trail_test_clayton"
  WHERE from_iso8601_timestamp(eventtime) > date_add('hour', -4, now())
    AND eventname = 'RunInstances'
    AND errorcode = 'Server.InternalError'
  ORDER BY eventtime;

They're all in 1b:

  $ for ZONE in a b c d e f g; do echo "${ZONE} $(grep -c "us-east-1${ZONE}" c128e363-4791-4049-8936-aafc6e2e36dd.csv)"; done
  a 0
  b 181
  c 0
  d 0
  e 0
  f 0
  g 0

This commit moves us to 1d instead.

[1]: https://storage.googleapis.com/origin-ci-test/pr-logs/pull/operator-framework_operator-lifecycle-manager/777/pull-ci-operator-framework-operator-lifecycle-manager-master-e2e-aws-olm/1365/artifacts/e2e-aws-olm/installer/.openshift_install.log

Author: wking

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-1c
+              - us-east-1d
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1c
+              - us-east-1d
         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-1c
+              - us-east-1d
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1c
+              - us-east-1d
         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-1c
+              - us-east-1d
         compute:
         - name: worker
           replicas: ${WORKERS}
-        controlPlane:
-        - replicas: ${MASTERS}
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1c
+              - us-east-1d
         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-1c
+              - us-east-1d
+        compute:
+        - name: worker
+          replicas: 3
+          platform:
+            aws:
+              zones:
+              - us-east-1a
+              - us-east-1c
+              - us-east-1d
         networking:
           clusterNetwork:
           - cidr: 10.128.0.0/14