Merge "Add an option for deploying OSA or other OSA powered cloud"

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 run the OSA playbooks, if you want to deploy other OSA powered cloud, you can set it to false.:
+  ``RUN_OSA=${RUN_OSA:-true}``
+
 
 Re-kicking the VMs
 ------------------

multi-node-aio/deploy-osa.sh

@@ -77,8 +77,10 @@ write_osa_swift_proxy_confd swift-proxy_hosts swift
 write_osa_swift_storage_confd swift_hosts swift
 ### =========== END WRITE OF conf.d FILES =========== ###
 
-
-pushd /opt/openstack-ansible/
+# Enable deploy OSA of the "${RUN_OSA}"
+RUN_OSA=${RUN_OSA:-true}
+if [[ "${RUN_OSA}" = true ]]; then
+  pushd /opt/openstack-ansible/
     # Bootstrap ansible into the environment
     bash ./scripts/bootstrap-ansible.sh
 
@@ -96,20 +98,21 @@ pushd /opt/openstack-ansible/
 
     # 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
+  popd
 
-# Set the number of forks for the ansible client calls
-export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15}
+  # Set the number of forks for the ansible client calls
+  export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15}
 
-pushd /opt/openstack-ansible
+  pushd /opt/openstack-ansible
     export DEPLOY_AIO=true
     bash ./scripts/run-playbooks.sh
-popd
+  popd
 
-EXEC_DIR="$(pwd)"
-pushd /opt/openstack-ansible/playbooks
+  EXEC_DIR="$(pwd)"
+  pushd /opt/openstack-ansible/playbooks
     if [[ -f "/usr/local/bin/openstack-ansible.rc" ]]; then
       source /usr/local/bin/openstack-ansible.rc
     fi
     ansible -m script -a "${EXEC_DIR}/openstack-service-setup.sh" 'utility_all[0]'
-popd
+  popd
+fi