Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ function populate_artifact_dir() {
s/X-Auth-Token.*/X-Auth-Token REDACTED/;
s/UserData:.*,/UserData: REDACTED,/;
' "${dir}/.openshift_install.log" > "${ARTIFACT_DIR}/.openshift_install.log"
sed -i '
s/password: .*/password: REDACTED/;
s/X-Auth-Token.*/X-Auth-Token REDACTED/;
s/UserData:.*,/UserData: REDACTED,/;
' "${dir}/terraform.txt"
tar -czvf "${ARTIFACT_DIR}/terraform.tar.gz" --remove-files "${dir}/terraform.txt"
}

function prepare_next_steps() {
Expand Down Expand Up @@ -203,7 +209,10 @@ fi
# ---------------------------------------------------------

date "+%F %X" > "${SHARED_DIR}/CLUSTER_INSTALL_START_TIME"
TF_LOG=debug openshift-install --dir="${dir}" create cluster 2>&1 | grep --line-buffered -v 'password\|X-Auth-Token\|UserData:' &
TF_LOG_PATH="${dir}/terraform.txt"
export TF_LOG_PATH

openshift-install --dir="${dir}" create cluster 2>&1 | grep --line-buffered -v 'password\|X-Auth-Token\|UserData:' &

set +e
wait "$!"
Expand Down Expand Up @@ -348,7 +357,7 @@ EOF
echo "Waited for stack $APPS_DNS_STACK_NAME"

# completing installation
TF_LOG=debug openshift-install --dir="${dir}" wait-for install-complete 2>&1 | grep --line-buffered -v 'password\|X-Auth-Token\|UserData:' &
openshift-install --dir="${dir}" wait-for install-complete 2>&1 | grep --line-buffered -v 'password\|X-Auth-Token\|UserData:' &
wait "$!"
ret="$?"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ ref:
- name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
default: ""
documentation: "Whether to use public only subnets. Implies no NAT gateways. Requires a VPC to be configured prior to install"
- name: TF_LOG
default: "INFO"
documentation: "Specifies the logging level for terraform components."
- name: TF_LOG_CORE
default: "INFO"
documentation: "Specifies the logging level for terraform core library."
- name: TF_LOG_PROVIDER
default: "INFO"
documentation: "Specifies the logging level for terraform provider libraries."
dependencies:
- name: "release:latest"
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
Expand Down