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

2016-11-30 16:31:36 +00:00 · 2016-11-30 16:31:36 +00:00 · b9f697719b
commit b9f697719b
parent 1f739c867a f881a0e4ee
1 changed files with 4 additions and 0 deletions
--- a/lib/nova_plugins/hypervisor-xenserver
+++ b/lib/nova_plugins/hypervisor-xenserver
@ -90,6 +90,10 @@ CRONTAB
        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