Merge pull request #2507 from smarterclayton/configure_aws_e2e

AWS e2e provider should identify zone and master and multizone

Author: openshift-merge-robot

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

@@ -213,7 +213,8 @@ objects:
           mkdir -p ~/.ssh
           cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_aws_rsa || true
           export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
-          export TEST_PROVIDER='{"type":"aws","zone":"us-east-1"}'
+          # TODO: make openshift-tests auto-discover this from cluster config
+          export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
           export KUBE_SSH_USER=core
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
           mkdir -p ~/.ssh

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

@@ -206,7 +206,8 @@ objects:
           mkdir -p ~/.ssh
           cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_aws_rsa || true
           export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
-          export TEST_PROVIDER='{"type":"aws","zone":"us-east-1"}'
+          # TODO: make openshift-tests auto-discover this from cluster config
+          export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
           export KUBE_SSH_USER=core
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
           mkdir -p ~/.ssh