diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 9 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 2df5fb63..c28c7b0b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -69,6 +69,15 @@ function overcloud_deploy { ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "rm -f overcloud-full.qcow2" scp ${SSH_OPTIONS[@]} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2 + if [ "${deploy_options_array['vpn']}" == 'True' ]; then + echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}" + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y install /root/quagga/*.rpm" \ + --run-command "systemctl enable zrpcd" \ + -a overcloud-full.qcow2 +EOI + fi + # Install ovs-dpdk inside the overcloud image if it is enabled. if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then # install dpdk packages before ovs diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 5ca91897..b7235952 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -271,4 +271,9 @@ if [[ "$ha_enabled" == 'True' ]]; then # trozet disable congress in HA until congress bugs are fixed overcloud_connect "controller0" "sudo pcs resource ban openstack-congress overcloud-controller-1; sudo pcs resource ban openstack-congress overcloud-controller-2; sudo systemctl restart openstack-congress" fi + +if [ "${deploy_options_array['vpn']}" == 'True' ]; then + # Check zrpcd is started + overcloud_connect "controller0" "sudo systemctl status zrpcd > /dev/null || echo 'WARNING: zrpcd is not running on controller0'" +fi } |