Merge "Make use of openvswitch elements"

elements/network-utils/element-deps

@@ -0,0 +1 @@
+openvswitch

elements/network-utils/install.d/70-network-utils

@@ -1,24 +1,4 @@
 #!/bin/bash
 set -eux
 
-install-packages openvswitch-switch python-netaddr
-
-if [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
-    os-svc-enable -n openvswitch-switch
-fi
-
-if [ "$DIB_INIT_SYSTEM" == "upstart" ] ; then
-    echo "start on starting cloud-init-nonet" >> /etc/init/openvswitch-switch.override
-    if [ ! -f /etc/init/openvswitch-switch.conf ] ; then
-        cat << 'EOF' > /etc/init/openvswitch-switch.conf
-# openvswitch-switch
-# the purpose of this job is
-#  * start openvwitch-switch in upstart rather than SysV startup
-pre-start script
-      export RUNLEVEL=2
-      /etc/init.d/openvswitch-switch start
-end script
-post-stop exec /etc/init.d/openvswitch-switch stop
-EOF
-    fi
-fi
+install-packages python-netaddr

elements/neutron/element-deps

@@ -3,5 +3,6 @@ os-apply-config
 os-is-bootstrap-host
 os-refresh-config
 os-svc-install
+openvswitch-datapath
 selinux
 source-repositories

elements/neutron/install.d/neutron-source-install/76-neutron

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -eux
 
-install-packages openvswitch-switch openvswitch-datapath-dkms
-
 # for BUG: https://bugs.launchpad.net/neutron/+bug/1225232
 echo "qpid-python" | tee -a /opt/stack/neutron/requirements.txt
 
@@ -21,8 +19,4 @@ echo "Defaults:neutron !requiretty" >> /etc/sudoers.d/neutron
 chmod 0440 /etc/sudoers.d/neutron
 visudo -c
 
-if [ "$DIB_INIT_SYSTEM" == "systemd" ]; then
-    os-svc-enable -n openvswitch-switch
-fi
-
 add-selinux-path-substitution /usr/bin $NEUTRON_VENV_DIR/bin