Fix quagga user and dirs

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

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 8cf1b04..17e24cc 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -98,10 +98,23 @@ 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
 
+  # disable neutron openvswitch agent from starting
+  if [[ -n "${deploy_options_array['sdn_controller']}" && "${deploy_options_array['sdn_controller']}" != 'False' ]]; then
+      echo -e "${blue}INFO: Disabling neutron-openvswitch-agent from systemd${reset}"
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -f /etc/systemd/system/multi-user.target.wants/neutron-openvswitch-agent.service" \
+                                               --run-command "rm -f /usr/lib/systemd/system/neutron-openvswitch-agent.service" \
+                                               -a overcloud-full.qcow2
+EOI
+  fi
+
   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 "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
@@ -154,7 +167,7 @@ EOI
   fi
 
   # Patch neutron with using OVS external interface for router and add generic linux NS interface driver
-  if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
+  if [[ "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<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