Skip to content

Commit e2a1abf

Browse files
author
Hector Vido
committed
Changed the default value for OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY to true
1 parent 6b36b3b commit e2a1abf

File tree

6 files changed

+267
-249
lines changed

6 files changed

+267
-249
lines changed

ci-operator/step-registry/ipi/aws/pre/publicsubnets/ipi-aws-pre-publicsubnets-chain.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
chain:
22
as: ipi-aws-pre-publicsubnets
33
steps:
4-
- chain: ipi-conf-aws-publicsubnets
54
- chain: ipi-install
65
documentation: |-
76
The IPI setup step contains all steps that provision an OpenShift cluster

ci-operator/step-registry/ipi/conf/aws/publicsubnets/ipi-conf-aws-publicsubnets-commands.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@ set -o nounset
44
set -o errexit
55
set -o pipefail
66

7-
export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
7+
if [[ "${OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY:-true}" != "true" ]]; then
8+
return
9+
fi
10+
11+
if [[ -f "${SHARED_DIR}/aws_minimal_permission" ]]; then
12+
echo "Setting AWS credential with minimal permision for installer"
13+
export AWS_SHARED_CREDENTIALS_FILE=${SHARED_DIR}/aws_minimal_permission
14+
else
15+
export AWS_SHARED_CREDENTIALS_FILE=${CLUSTER_PROFILE_DIR}/.awscred
16+
fi
817

918
function join_by { local IFS="$1"; shift; echo "$*"; }
1019

@@ -190,8 +199,7 @@ Outputs:
190199
EOF
191200

192201
# The above cloudformation template's max zones account is 3
193-
if [[ "${ZONES_COUNT}" -gt 3 ]]
194-
then
202+
if [[ "${ZONES_COUNT}" -gt 3 ]]; then
195203
ZONES_COUNT=3
196204
fi
197205

0 commit comments

Comments
 (0)