openstack/openstack-ansible
Code Issues Proposed changes

Fix Bootstrap AIO Passing Multiple BOOTSTRAP_OPTS

Browse Source 
Change #550473 removed the quotes around ${BOOTSTRAP_OPTS}
when running the bootstrap-aio.yml playbook. This broke the
ability to specify multiple BOOTSTRAP_OPTS using the space
separated key=value syntax, as demonstrated in the AIO
Quickstart Guide.

This change fixes the brokenness of BOOTSTRAP_OPTS by pre-
fixing each BOOTSTRAP_OPTS item with a "-e", which will
accomodate specifying multiple vars files, as well as
specifying a mix of "key=value" and "@file.yml" items
in BOOTSTRAP_OPTS.

Change-Id: Ia32c646a180f3d3f868dc73eb38778853fbdf000
Depends-On: Ie3960e2e2ac9c0aff0bc36f46182be2fc0a038b3
Bug: 1784491
This commit is contained in:
Byron McCollum 2018-07-30 16:00:52 -05:00
parent a75af3e6fd
commit 98d774072b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/bootstrap-aio.sh
View File

@ -33,9 +33,13 @@ pushd tests
/opt/ansible-runtime/bin/ansible-playbook bootstrap-aio.yml \ /opt/ansible-runtime/bin/ansible-playbook bootstrap-aio.yml \
-i test-inventory.ini -i test-inventory.ini
else else
export BOOTSTRAP_OPTS_ITEMS=''
for BOOTSTRAP_OPT in ${BOOTSTRAP_OPTS}; do
BOOTSTRAP_OPTS_ITEMS=${BOOTSTRAP_OPTS_ITEMS}"-e "${BOOTSTRAP_OPT}" "
done
/opt/ansible-runtime/bin/ansible-playbook bootstrap-aio.yml \ /opt/ansible-runtime/bin/ansible-playbook bootstrap-aio.yml \
-i test-inventory.ini \ -i test-inventory.ini \
-e ${BOOTSTRAP_OPTS} ${BOOTSTRAP_OPTS_ITEMS}
fi fi
popd popd