summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-26 16:25:04 -0400
committerTim Rozet <trozet@redhat.com>2017-03-26 19:30:01 -0400
commit2ea2ee214210f1eec14c8bdf91260ee883eb3192 (patch)
tree8a574b02ee8713ee05742863566479a3a69ec091
parent59e92f9ac358d6d055fa051a3aaa4e6b5a88f558 (diff)
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>
-rwxr-xr-xlib/overcloud-deploy-functions.sh10
1 files changed, 10 insertions, 0 deletions
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