diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-06-29 14:11:05 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-06-29 14:11:05 +0100 |
| commit | 4d8d678240ab20db773095d60244e9adbf464251 (patch) | |
| tree | 237bd964c807b18bb46b48cb8c768d2b0c20f1c6 /tools | |
| parent | 0673e98539d66f556a33076ff230b30f114b5fdf (diff) | |
| download | kolla-ansible-4d8d678240ab20db773095d60244e9adbf464251.tar.gz kolla-ansible-4d8d678240ab20db773095d60244e9adbf464251.zip | |
Fix unexpected message without globals.d
Recently a feature was merged to support pulling in multiple
configuration files from a globals.d directory. However, if this
directory does not exist, we get the following error when executing
kolla-ansible:
find: '/etc/kolla/globals.d': No such file or directory
This change addresses this by redirecting find command stderr to
/dev/null.
TrivialFix
Change-Id: Ie5aa511a5ebf3355817a7c3bb65b09ac5dcf2b67
Diffstat (limited to 'tools')
| -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 fca10ea71..8221c15cb 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -453,7 +453,7 @@ EOF esac GLOBALS_DIR="${CONFIG_DIR}/globals.d" -EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p') +EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p' 2>/dev/null) 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 |