From d2a8889a543e4437cc4f894130c6ea5c6be98eaa Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Fri, 17 Sep 2021 16:34:50 -0700 Subject: [PATCH] Remove provision_installer CI function --- ci/_common.sh | 9 --------- ci/provision_installer.sh | 6 +++++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ci/_common.sh b/ci/_common.sh index ef22a4e5..e61a655c 100755 --- a/ci/_common.sh +++ b/ci/_common.sh @@ -15,15 +15,6 @@ set -o pipefail # shellcheck source=tests/_utils.sh source ../tests/_utils.sh -# provision_installer() - Deploys the installer node -function provision_installer { - if [[ "${HOST_INSTALLER:-false}" == "true" ]]; then - KRD_DEBUG=true ./krd_command.sh -a install_k8s - else - $VAGRANT_CMD_UP installer - fi -} - # run_installer_cmd() - Runs a specific command on the installer node function run_installer_cmd { if [[ "${HOST_INSTALLER:-false}" == "true" ]]; then diff --git a/ci/provision_installer.sh b/ci/provision_installer.sh index d45c1f84..738c896b 100755 --- a/ci/provision_installer.sh +++ b/ci/provision_installer.sh @@ -16,7 +16,11 @@ set -o pipefail source _common.sh if [ "$($VAGRANT_CMD status installer | grep "^installer" | awk '{ print $2}')" != "running" ]; then - provision_installer + if [[ "${HOST_INSTALLER:-false}" == "true" ]]; then + KRD_DEBUG=true ./krd_command.sh -a install_k8s + else + $VAGRANT_CMD_UP installer + fi else run_installer_cmd . ./krd_command.sh -a install_k8s fi