From 81f3aa5ac04528fa201ed534547f20efb5aeecc2 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 28 Sep 2022 16:12:46 +0200 Subject: [PATCH] init-runonce: Add KOLLA_CONFIG_PATH support Kayobe uses it, so let's fix the check. Change-Id: I99b2a7f8609fd708f4829f21c81029c7b8da5d73 --- tools/init-runonce | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/init-runonce b/tools/init-runonce index 9a93216b50..5f18a377d1 100755 --- a/tools/init-runonce +++ b/tools/init-runonce @@ -4,6 +4,7 @@ set -o errexit set -o pipefail KOLLA_DEBUG=${KOLLA_DEBUG:-0} +KOLLA_CONFIG_PATH=${KOLLA_CONFIG_PATH:-/etc/kolla} KOLLA_OPENSTACK_COMMAND=openstack @@ -48,14 +49,14 @@ for i in curl openstack; do done # Test for clouds.yaml -if [[ ! -f /etc/kolla/clouds.yaml ]]; then - echo "/etc/kolla/clouds.yaml is missing." +if [[ ! -f ${KOLLA_CONFIG_PATH}/clouds.yaml ]]; then + echo "${KOLLA_CONFIG_PATH}/clouds.yaml is missing." echo " Did your deploy finish successfully?" exit 1 fi # Specify clouds.yaml file to use -export OS_CLIENT_CONFIG_FILE=/etc/kolla/clouds.yaml +export OS_CLIENT_CONFIG_FILE=${KOLLA_CONFIG_PATH}/clouds.yaml # Select admin account from clouds.yaml export OS_CLOUD=kolla-admin