diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst index b2426d9f..0250191e 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 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 ------------------ diff --git a/multi-node-aio/deploy-osa.sh b/multi-node-aio/deploy-osa.sh index ab838460..1f090316 100755 --- a/multi-node-aio/deploy-osa.sh +++ b/multi-node-aio/deploy-osa.sh @@ -77,39 +77,42 @@ 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 -pushd /opt/openstack-ansible/ - # Bootstrap ansible into the environment - bash ./scripts/bootstrap-ansible.sh + # Generate the passwords for the environment + python ./scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml - # Generate the passwords for the environment - python ./scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml + # This is happening so the VMs running the infra use less storage + 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 - osa_user_var_add lxc_container_backing_store 'lxc_container_backing_store: dir' + # Tempest is being configured to use a known network + 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 - osa_user_var_add tempest_public_subnet_cidr 'tempest_public_subnet_cidr: 172.29.248.0/22' + # This makes running neutron in a distributed system easier and a lot less noisy + 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 - osa_user_var_add neutron_l2_population 'neutron_l2_population: True' + # 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 - # 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 + # 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 + export DEPLOY_AIO=true + bash ./scripts/run-playbooks.sh + popd -pushd /opt/openstack-ansible - export DEPLOY_AIO=true - bash ./scripts/run-playbooks.sh -popd - -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 + 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 +fi