From ff9002ba3614673ffb68c717f0ace119735433f1 Mon Sep 17 00:00:00 2001
From: Weezer Su <weezer.su@gmail.com>
Date: Wed, 2 Nov 2016 11:31:14 -0500
Subject: [PATCH] Add PRE_CONFIG_OSA option and move the RUN_OSA to the run
 playbook part

Add PRE_CONFIG_OSA to set up the user_variable and all the other
parameters for OSA powered cloud, and move the RUN_OSA to the playbook
part.

Change-Id: Ia962e42466dd2a123e30b1a9c37e60a371710842
---
 multi-node-aio/README.rst    |  3 +++
 multi-node-aio/deploy-osa.sh | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst
index 1984a48d..c23a304d 100644
--- a/multi-node-aio/README.rst
+++ b/multi-node-aio/README.rst
@@ -136,6 +136,9 @@ Instruct the system do all of the cobbler setup:
 Instruct the system do all of the virsh network setup:
   ``SETUP_VIRSH_NET=${SETUP_VIRSH_NET:-true}``
 
+Instruct the system to pre-config the envs for running OSA playbooks:
+  ``PRE_CONFIG_OSA=${PRE_CONFIG_OSA:-true}``
+
 Instruct the system to run the OSA playbooks, if you want to deploy other OSA powered cloud, you can set it to false:
   ``RUN_OSA=${RUN_OSA:-true}``
 
diff --git a/multi-node-aio/deploy-osa.sh b/multi-node-aio/deploy-osa.sh
index 4becf005..70e48432 100755
--- a/multi-node-aio/deploy-osa.sh
+++ b/multi-node-aio/deploy-osa.sh
@@ -77,9 +77,9 @@ write_osa_swift_proxy_confd swift-proxy_hosts swift
 write_osa_swift_storage_confd swift_hosts swift
 ### =========== END WRITE OF conf.d FILES =========== ###
 
-# Enable deploy OSA of the "${RUN_OSA}"
-RUN_OSA=${RUN_OSA:-true}
-if [[ "${RUN_OSA}" = true ]]; then
+# Enable pre-config the OSA enviroment for deploying OSA.
+PRE_CONFIG_OSA=${PRE_CONFIG_OSA:-true}
+if [[ "${PRE_CONFIG_OSA}" = true ]]; then
   pushd /opt/openstack-ansible/
     # Bootstrap ansible into the environment
     bash ./scripts/bootstrap-ansible.sh
@@ -99,7 +99,11 @@ if [[ "${RUN_OSA}" = true ]]; then
     # This makes the glance image store use swift instead of the file backend
     osa_user_var_add glance_default_store 'glance_default_store: swift'
   popd
+fi
 
+# Enable deploy OSA of the "${RUN_OSA}"
+RUN_OSA=${RUN_OSA:-true}
+if [[ "${RUN_OSA}" = true ]]; then
   # Set the number of forks for the ansible client calls
   export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15}