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

This commit is contained in:
Jenkins 2016-10-19 15:24:48 +00:00 committed by Gerrit Code Review
commit 213884ebb8
2 changed files with 34 additions and 28 deletions

@ -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
------------------

@ -77,7 +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
pushd /opt/openstack-ansible/
# Bootstrap ansible into the environment
bash ./scripts/bootstrap-ansible.sh
@ -113,3 +115,4 @@ pushd /opt/openstack-ansible/playbooks
fi
ansible -m script -a "${EXEC_DIR}/openstack-service-setup.sh" 'utility_all[0]'
popd
fi