From 98d774072b5b01bfa39cbbfd8a10ebac9dcdb597 Mon Sep 17 00:00:00 2001
From: Byron McCollum <byron.mccollum@rackspace.com>
Date: Mon, 30 Jul 2018 16:00:52 -0500
Subject: [PATCH] Fix Bootstrap AIO Passing Multiple BOOTSTRAP_OPTS

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
---
 scripts/bootstrap-aio.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index 85ae13be8d..cdcf55df90 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -33,9 +33,13 @@ pushd tests
     /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 \
-                     -e ${BOOTSTRAP_OPTS}
+                     ${BOOTSTRAP_OPTS_ITEMS}
   fi
 popd