forked from openshift/release
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cluster-launch-installer-e2e*: Drop AMI override
Since openshift/installer@66ef3beb (*: remove support for container linux, 2018-09-06, openshift/installer#221), the installer defaults to a recent RHCOS AMI. Drop the override here, so we can track RHCOS with only installer-repo bumps. I've left the variable in the template so that, if this repo needs to have its own, separate, opinion again, it can set the override again. However, to support the no-local-opinion case, the new local-opinion syntax will be: export EC2_AMI_OVERRIDE='ec2AMIOverride: ami-07307c397daf4d02e'
- Loading branch information
Showing
3 changed files
with
1 addition
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters