From 847cfbca6adf8dc736a61bb7595d99977b9ca237 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 13 Apr 2020 13:35:27 -0700
Subject: [PATCH] ci-operator/step-registry/ipi/install: Drop TF_LOG from
 'create manifests'

No Terraform involved in creating manifests.  Cleans up after
d11bca7007 (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 4472ace120
(ci-operator/templates/openshift/installer: Restore backgrounded
'create cluster', 2019-01-23, #2680).
---
 .../ipi/install/install/ipi-install-install-commands.sh      | 5 ++---
 .../ipi/install/install/ipi-install-install-ref.yaml         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
index 244b34e98b72..62324b831cb0 100755
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
+++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
@@ -35,8 +35,8 @@ 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
@@ -44,7 +44,6 @@ do
   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
diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
index e7af1749dacc..67eebe50f90d 100644
--- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
+++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
@@ -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.