98d774072b
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
46 lines
1.5 KiB
Bash
Executable File
46 lines
1.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# Copyright 2014, Rackspace US, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
## Shell Opts ----------------------------------------------------------------
|
|
set -e -u -x
|
|
|
|
## Variables -----------------------------------------------------------------
|
|
# Extra options to pass to the AIO bootstrap process
|
|
export BOOTSTRAP_OPTS=${BOOTSTRAP_OPTS:-''}
|
|
|
|
## Main ----------------------------------------------------------------------
|
|
|
|
# Run AIO bootstrap playbook
|
|
unset ANSIBLE_VARS_PLUGINS
|
|
unset HOST_VARS_PATH
|
|
unset GROUP_VARS_PATH
|
|
|
|
pushd tests
|
|
if [ -z "${BOOTSTRAP_OPTS}" ]; then
|
|
/opt/ansible-runtime/bin/ansible-playbook bootstrap-aio.yml \
|
|
-i test-inventory.ini
|
|
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 \
|
|
-i test-inventory.ini \
|
|
${BOOTSTRAP_OPTS_ITEMS}
|
|
fi
|
|
popd
|
|
|