openstack/kolla-ansible
Code Issues Proposed changes

init-runonce: Add KOLLA_CONFIG_PATH support

Browse Source 
Kayobe uses it, so let's fix the check.

Change-Id: I99b2a7f8609fd708f4829f21c81029c7b8da5d73
This commit is contained in:
Michal Nasiadka 2022-09-28 16:12:46 +02:00
parent 6bff120d2d
commit 81f3aa5ac0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/init-runonce
View File

@ -4,6 +4,7 @@ set -o errexit
set -o pipefail set -o pipefail
KOLLA_DEBUG=${KOLLA_DEBUG:-0} KOLLA_DEBUG=${KOLLA_DEBUG:-0}
KOLLA_CONFIG_PATH=${KOLLA_CONFIG_PATH:-/etc/kolla}
KOLLA_OPENSTACK_COMMAND=openstack KOLLA_OPENSTACK_COMMAND=openstack
@ -48,14 +49,14 @@ for i in curl openstack; do
done done
# Test for clouds.yaml # Test for clouds.yaml
if [[ ! -f /etc/kolla/clouds.yaml ]]; then if [[ ! -f ${KOLLA_CONFIG_PATH}/clouds.yaml ]]; then
echo "/etc/kolla/clouds.yaml is missing." echo "${KOLLA_CONFIG_PATH}/clouds.yaml is missing."
echo " Did your deploy finish successfully?" echo " Did your deploy finish successfully?"
exit 1 exit 1
fi fi
# Specify clouds.yaml file to use # 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 # Select admin account from clouds.yaml
export OS_CLOUD=kolla-admin export OS_CLOUD=kolla-admin