Skip to content

cluster/test-deploy/aws/openshift: Move sshKey to the admin block #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 17, 2018
Merged

cluster/test-deploy/aws/openshift: Move sshKey to the admin block #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci-operator/templates/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ objects:
(
export [email protected]
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
Expand Down
4 changes: 1 addition & 3 deletions cluster/test-deploy/aws/openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand Down