Merge "Adding OVN as an SDN option to Apex"

[apex.git] / lib / overcloud-deploy-functions.sh

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index ec03aaa..37e8229 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -121,6 +121,9 @@ EOI
       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 "sudo usermod -a -G quaggavt quagga" \
+                                               --run-command "sudo mkdir -p /var/run/quagga/" \
+                                               --run-command "sudo chown quagga:quagga -R /var/run/quagga/" \
                                                --run-command "systemctl enable zrpcd" \
                                                -a overcloud-full.qcow2
 EOI
@@ -178,6 +181,15 @@ EOI
       LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
                                                -a overcloud-full.qcow2
 EOI
+
+    # Disable clustering for ODL FDIO HA scenarios
+    if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /etc/puppet/modules/tripleo/ && patch -p1 < disable_odl_clustering.patch" \
+                                               -a overcloud-full.qcow2
+EOI
+    fi
+
     # Configure routing node for odl_l3-fdio
     if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI