aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKonstantinos Mouzakitis <kon.mouzakitis@vscaler.com>2020-06-09 12:59:52 -0400
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-06-18 17:33:51 +0000
commitf6d8c0d481306a45d61ed224c02ff12615e83ec9 (patch)
tree97b2fa40bcb50682abb4cbb0578e0ec0d093e257 /tools
parentce1dc6da0a9de197c149cd045d48ff7a25c54701 (diff)
downloadkolla-ansible-f6d8c0d481306a45d61ed224c02ff12615e83ec9.tar.gz
kolla-ansible-f6d8c0d481306a45d61ed224c02ff12615e83ec9.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kolla-ansible4
1 files changed, 3 insertions, 1 deletions
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