Browse code

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

Jenkins authored on 2016/12/01 01:31:36
Showing 1 changed files
... ...
@@ -90,6 +90,10 @@ CRONTAB
90 90
         echo "install_conntrack_tools"
91 91
     } | $ssh_dom0
92 92
 
93
+    if is_service_enabled neutron; then
94
+        # Remove restriction on linux bridge in Dom0 when neutron is enabled
95
+        $ssh_dom0 "rm -f /etc/modprobe.d/blacklist-bridge*"
96
+    fi
93 97
 }
94 98
 
95 99
 # install_nova_hypervisor() - Install external components