diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-19 18:29:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-19 18:29:39 +0000 |
| commit | 6873931f1dd20458d8e0480c3a2f9e846e248b1c (patch) | |
| tree | 8e34e4d5784ffe335ee6f3adc8b3036cfad91fdb | |
| parent | 005c6fae38681cd5907fc08d0154334ad6c6e024 (diff) | |
| parent | 35b92825b1cf428e7de121a217f9064668006f33 (diff) | |
| download | kolla-ansible-6873931f1dd20458d8e0480c3a2f9e846e248b1c.tar.gz kolla-ansible-6873931f1dd20458d8e0480c3a2f9e846e248b1c.zip | |
Merge "cli: fix find globals.d"
| -rwxr-xr-x | tools/kolla-ansible | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 579f923e9..f9cb791d0 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -567,7 +567,7 @@ EOF esac GLOBALS_DIR="${CONFIG_DIR}/globals.d" -EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p' || true 2>/dev/null) +EXTRA_GLOBALS=$([ -d "${GLOBALS_DIR}" ] && find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p' || true 2>/dev/null) PASSWORDS_FILE="${PASSWORDS_FILE:-${CONFIG_DIR}/passwords.yml}" CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml ${EXTRA_GLOBALS} -e @${PASSWORDS_FILE} -e CONFIG_DIR=${CONFIG_DIR}" CMD="ansible-playbook $CONFIG_OPTS $EXTRA_OPTS $PLAYBOOK $VERBOSITY" |