diff --git a/ci-operator/templates/cluster-launch-installer-e2e.yaml b/ci-operator/templates/cluster-launch-installer-e2e.yaml index 2c9042e22a117..005b3d383f80b 100644 --- a/ci-operator/templates/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/cluster-launch-installer-e2e.yaml @@ -190,6 +190,7 @@ objects: ( export EMAIL=test@ci.openshift.io export PASSWORD=$( date +%s | sha256sum | base64 | head -c 32 ; echo ) + export SSH_KEY="$( cat /etc/openshift-installer/ssh-publickey )" export EC2_AMI_OVERRIDE=ami-02323e873420d8eab export EXPIRATION_DATE=$( date -d '4 hours' --iso=minutes --utc ) cat /etc/openshift-installer/openshift.yaml | envsubst > /tmp/cluster/inputs.yaml diff --git a/cluster/test-deploy/aws/openshift.yaml b/cluster/test-deploy/aws/openshift.yaml index 341baf80e3040..21e55494b660c 100644 --- a/cluster/test-deploy/aws/openshift.yaml +++ b/cluster/test-deploy/aws/openshift.yaml @@ -1,6 +1,7 @@ admin: email: "${EMAIL}" password: "${PASSWORD}" + sshKey: "${SSH_KEY}" aws: # (optional) Unique name under which the Amazon S3 bucket will be created. Bucket name must start with a lower case name and is limited to 63 characters. # The Tectonic Installer uses the bucket to store tectonic assets and kubeconfig. @@ -130,9 +131,6 @@ aws: # The target AWS region for the cluster. region: us-east-1 - # Name of an SSH key located within the AWS region. Example: coreos-user. - sshKey: libra - # Block of IP addresses used by the VPC. # This should not overlap with any other networks, such as a private datacenter connected via Direct Connect. vpcCIDRBlock: 10.0.0.0/16