From 1dc83b5751dc3c86b3b68f4734ec9fd1761be54f Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Sun, 26 Mar 2017 16:25:04 -0400
Subject: Removes neutron ovs agent systemd when not nosdn

Bug in ovs agent systemd where it is started when openvswitch is
restarted.  This is causing ODL DPDK deployments to fail because
openvswitch is creating br-int as type system instead of netdev.

JIRA: APEX-427

Change-Id: Iea7f6a5553d2ca1f372f4dec82f576d62827e887
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 2ea2ee214210f1eec14c8bdf91260ee883eb3192)
---
 lib/overcloud-deploy-functions.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 8cf1b043..1301e2cd 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -98,6 +98,16 @@ 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
-- 
cgit 1.2.3-korg