From ddfb389d1225694bddb72dbaf213e2ad862a2d0b Mon Sep 17 00:00:00 2001 From: Jeremiah Stuever Date: Mon, 8 Jun 2020 14:21:40 -0700 Subject: [PATCH] upi-gcp-install: enable 'worker' name for compute nodes This change updates the upi-gcp-install step to be able to use the full word 'worker' in the name of compute nodes. It maintains compatiblity with the the older 'w' naming convention by looking at if 'm' or 'master' is used in control_plane.py per #9490. https://github.com/openshift/installer/pull/3713 https://github.com/openshift/release/pull/9490 --- .../step-registry/upi/install/gcp/upi-install-gcp-commands.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh index c3e35bccbc1a5..bbba3d7196e65 100755 --- a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh +++ b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh @@ -343,8 +343,10 @@ ret="$?" set -e if [[ "$ret" == 0 ]]; then MASTER='master' + WORKER='worker' else MASTER='m' + WORKER='w' fi ## Configure control plane variables @@ -396,7 +398,7 @@ EOF for compute in {0..2}; do cat <> 06_worker.yaml -- name: 'w-${compute}' +- name: '${WORKER}-${compute}' type: 06_worker.py properties: infra_id: '${INFRA_ID}'