openstack/kolla-ansible
Code Issues Proposed changes

Evaluate PASSWORDS_FILE later

Browse Source 
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:
Michal Nasiadka 2020-07-08 12:08:23 +02:00 committed by Radosław Piliszek
parent 904f1c9bd9
commit bf985930d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/bug-1887180-89450a4185c7449d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes ``--configdir`` parameter to apply to default ``passwords.yml``
location.
`LP#1887180 <https://launchpad.net/bugs/1887180>`__

2
tools/kolla-ansible
View File

@ -198,7 +198,6 @@ PLAYBOOK="${BASEDIR}/ansible/site.yml"
VERBOSITY= VERBOSITY=
EXTRA_OPTS=${EXTRA_OPTS} EXTRA_OPTS=${EXTRA_OPTS}
CONFIG_DIR="/etc/kolla" CONFIG_DIR="/etc/kolla"
PASSWORDS_FILE="${CONFIG_DIR}/passwords.yml"
DANGER_CONFIRM= DANGER_CONFIRM=
INCLUDE_IMAGES= INCLUDE_IMAGES=
INCLUDE_DEV= INCLUDE_DEV=
@ -454,6 +453,7 @@ esac
GLOBALS_DIR="${CONFIG_DIR}/globals.d" GLOBALS_DIR="${CONFIG_DIR}/globals.d"
EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p' 2>/dev/null) EXTRA_GLOBALS=$(find ${GLOBALS_DIR} -maxdepth 1 -type f -name '*.yml' -printf ' -e @%p' 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}" 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" CMD="ansible-playbook -i $INVENTORY $CONFIG_OPTS $EXTRA_OPTS $PLAYBOOK $VERBOSITY"
process_cmd process_cmd