Skip to content

cluster-launch-installer-e2e*: Drop AMI override #1436

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
Sep 11, 2018
+1 −3
Merged

cluster-launch-installer-e2e*: Drop AMI override #1436

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: 0 additions & 1 deletion ci-operator/templates/cluster-launch-installer-e2e-smoke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ 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-07307c397daf4d02e
export EXPIRATION_DATE=$( date -d '4 hours' --iso=minutes --utc )
envsubst </etc/openshift-installer/openshift.yaml >/tmp/cluster/inputs.yaml
)
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -193,7 +193,6 @@ 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-07307c397daf4d02e
export EXPIRATION_DATE=$( date -d '4 hours' --iso=minutes --utc )
envsubst </etc/openshift-installer/openshift.yaml >/tmp/cluster/inputs.yaml
)
Expand Down
2 changes: 1 addition & 1 deletion cluster/test-deploy/aws/openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ aws:
# assetsS3BucketName:

# (optional) AMI override for all nodes. Example: `ami-foobar123`.
ec2AMIOverride: "${EC2_AMI_OVERRIDE}"
${EC2_AMI_OVERRIDE}

external:
# (optional) List of subnet IDs within an existing VPC to deploy master nodes into.
Expand Down