commit b9f697719b8fb2bbfe0b0246b31fb65346e8a92c
author Jenkins <jenkins@review.openstack.org> Wed Nov 30 16:31:36 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 30 16:31:36 2016 +0000
tree a23b35de2438dbfa0f2c700fd5bf9cb84492b609
parent 1f739c867a7fe6d54ca061c6352eed12873db5cc
parent f881a0e4ee995a2e2122e0e048cc8b7ccc88d6a0

Merge "XenAPI: Enable linux bridge in Dom0 for neturon"

lib/nova_plugins/hypervisor-xenserver

diff --git a/lib/nova_plugins/hypervisor-xenserver b/lib/nova_plugins/hypervisor-xenserver
index e5d25da..a63e72e 100644
--- a/lib/nova_plugins/hypervisor-xenserver
+++ b/lib/nova_plugins/hypervisor-xenserver
@@ -90,6 +90,10 @@
         echo "install_conntrack_tools"
     } | $ssh_dom0
 
+    if is_service_enabled neutron; then
+        # Remove restriction on linux bridge in Dom0 when neutron is enabled
+        $ssh_dom0 "rm -f /etc/modprobe.d/blacklist-bridge*"
+    fi
 }
 
 # install_nova_hypervisor() - Install external components