openstack/openstack-ansible-ops
Code Issues Proposed changes

Add an option for deploying OSA or other OSA powered cloud

Browse Source 
Add an option $RUN_OSA to the deploy-osa.sh to let user have more
choices, if user want to deploy another OSA powered cloud on AIO-
multinode, he can switch it to false and then use the existing env
to deploy the cloud he wants to.

Change-Id: Ief8c701f596595607d3b86ac03f17d6690f5954f
Closes-Bug: #1634582
This commit is contained in:
Weezer Su 2016-10-18 15:57:01 -05:00
parent bf09a35de7
commit 9b5320dcb9
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multi-node-aio/README.rst
View File

@ -136,6 +136,9 @@ Instruct the system do all of the cobbler setup:
Instruct the system do all of the virsh network setup: Instruct the system do all of the virsh network setup:
``SETUP_VIRSH_NET=${SETUP_VIRSH_NET:-true}`` ``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 Re-kicking the VMs
------------------ ------------------

59
multi-node-aio/deploy-osa.sh
View File

@ -77,39 +77,42 @@ write_osa_swift_proxy_confd swift-proxy_hosts swift
write_osa_swift_storage_confd swift_hosts swift write_osa_swift_storage_confd swift_hosts swift
### =========== END WRITE OF conf.d FILES =========== ### ### =========== 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
pushd /opt/openstack-ansible/ # Generate the passwords for the environment
# Bootstrap ansible into the environment python ./scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
bash ./scripts/bootstrap-ansible.sh
# Generate the passwords for the environment # This is happening so the VMs running the infra use less storage
python ./scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml osa_user_var_add lxc_container_backing_store 'lxc_container_backing_store: dir'
# This is happening so the VMs running the infra use less storage # Tempest is being configured to use a known network
osa_user_var_add lxc_container_backing_store 'lxc_container_backing_store: dir' osa_user_var_add tempest_public_subnet_cidr 'tempest_public_subnet_cidr: 172.29.248.0/22'
# Tempest is being configured to use a known network # This makes running neutron in a distributed system easier and a lot less noisy
osa_user_var_add tempest_public_subnet_cidr 'tempest_public_subnet_cidr: 172.29.248.0/22' osa_user_var_add neutron_l2_population 'neutron_l2_population: True'
# This makes running neutron in a distributed system easier and a lot less noisy # This makes the glance image store use swift instead of the file backend
osa_user_var_add neutron_l2_population 'neutron_l2_population: True' osa_user_var_add glance_default_store 'glance_default_store: swift'
popd
# This makes the glance image store use swift instead of the file backend # Set the number of forks for the ansible client calls
osa_user_var_add glance_default_store 'glance_default_store: swift' export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15}
popd
# Set the number of forks for the ansible client calls pushd /opt/openstack-ansible
export ANSIBLE_FORKS=${ANSIBLE_FORKS:-15} export DEPLOY_AIO=true
bash ./scripts/run-playbooks.sh
popd
pushd /opt/openstack-ansible EXEC_DIR="$(pwd)"
export DEPLOY_AIO=true pushd /opt/openstack-ansible/playbooks
bash ./scripts/run-playbooks.sh if [[ -f "/usr/local/bin/openstack-ansible.rc" ]]; then
popd source /usr/local/bin/openstack-ansible.rc
fi
EXEC_DIR="$(pwd)" ansible -m script -a "${EXEC_DIR}/openstack-service-setup.sh" 'utility_all[0]'
pushd /opt/openstack-ansible/playbooks popd
if [[ -f "/usr/local/bin/openstack-ansible.rc" ]]; then fi
source /usr/local/bin/openstack-ansible.rc
fi
ansible -m script -a "${EXEC_DIR}/openstack-service-setup.sh" 'utility_all[0]'
popd