Evaluate PASSWORDS_FILE later
Currently seting --configdir on kolla-ansible CLI doesn't set properly the path for the passwords file. Change-Id: I38d215b721ec256be6cfdd6313b5ffb90c2a3f4c Closes-Bug: #1887180 Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com>
This commit is contained in:
parent
1629f5fe08
commit
8d7cc7239b
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Fixes ``--configdir`` parameter to apply to default ``passwords.yml``
|
||||
location.
|
||||
`LP#1887180 <https://launchpad.net/bugs/1887180>`__
|
|
@ -193,7 +193,6 @@ PLAYBOOK="${BASEDIR}/ansible/site.yml"
|
|||
VERBOSITY=
|
||||
EXTRA_OPTS=${EXTRA_OPTS}
|
||||
CONFIG_DIR="/etc/kolla"
|
||||
PASSWORDS_FILE="${CONFIG_DIR}/passwords.yml"
|
||||
DANGER_CONFIRM=
|
||||
INCLUDE_IMAGES=
|
||||
INCLUDE_DEV=
|
||||
|
@ -435,6 +434,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
|
||||
PASSWORDS_FILE="${PASSWORDS_FILE:-${CONFIG_DIR}/passwords.yml}"
|
||||
CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml -e @${PASSWORDS_FILE} -e CONFIG_DIR=${CONFIG_DIR}"
|
||||
CMD="ansible-playbook -i $INVENTORY $CONFIG_OPTS $EXTRA_OPTS $PLAYBOOK $VERBOSITY"
|
||||
process_cmd
|
||||
|
|
Loading…
Reference in New Issue