Skip to content

Commit

Permalink
ci-operator/step-registry/ipi/install: Drop TF_LOG from 'create manif…
Browse files Browse the repository at this point in the history
…ests'

No Terraform involved in creating manifests.  Cleans up after
d11bca7 (create a hybrid cluster and run the e2e tests on it,
2020-04-01, #8075).  Also removes trailing whitespace from the YAML
documentation.

Also backgrounds the 'create manifests' call and immediately waits for
it, so we can gracefully handle TERM as described in 4472ace
(ci-operator/templates/openshift/installer: Restore backgrounded
'create cluster', 2019-01-23, #2680).
  • Loading branch information
wking committed Apr 13, 2020
1 parent 28e2aa4 commit 847cfbc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ cp "${SHARED_DIR}/install-config.yaml" "${dir}/"
mkdir -p ~/.ssh
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/


TF_LOG=debug openshift-install --dir="${dir}" create manifests
openshift-install --dir="${dir}" create manifests &
wait "$!"

while IFS= read -r -d '' item
do
manifest="$( basename "${item}" )"
cp "${item}" "${dir}/manifests/${manifest##manifest_}"
done < <( find "${SHARED_DIR}" -name "manifest_*.yml" -print0)


TF_LOG=debug openshift-install --dir="${dir}" create cluster 2>&1 | grep --line-buffered -v password &

set +e
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ ref:
cpu: 1000m
memory: 2Gi
documentation: |-
The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.

0 comments on commit 847cfbc

Please sign in to comment.