From f6d8c0d481306a45d61ed224c02ff12615e83ec9 Mon Sep 17 00:00:00 2001 From: Konstantinos Mouzakitis Date: Tue, 9 Jun 2020 12:59:52 -0400 Subject: Adding support for multiple globals files Added a spec file for this blueprint. Changed the kolla-ansible script to accept more than one globals.yml file. That will still be the main one but operators will be able to create more, under the /etc/kolla/globals.d directory. Also added some paragraphs in the quickstart documentation about this. Finally, Adding a release note Change-Id: I34eb91d0e2ed80694594b8fc6801cf8ad77da754 Implements: blueprint multiple-globals-files --- tools/kolla-ansible | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/kolla-ansible b/tools/kolla-ansible index dfc98cec5..fca10ea71 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -452,6 +452,8 @@ EOF ;; esac -CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml -e @${PASSWORDS_FILE} -e CONFIG_DIR=${CONFIG_DIR}" +GLOBALS_DIR="${CONFIG_DIR}/globals.d" +EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p') +CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml ${EXTRA_GLOBALS} -e @${PASSWORDS_FILE} -e CONFIG_DIR=${CONFIG_DIR}" CMD="ansible-playbook -i $INVENTORY $CONFIG_OPTS $EXTRA_OPTS $PLAYBOOK $VERBOSITY" process_cmd -- cgit v1.2.3