summaryrefslogtreecommitdiff
path: root/openstack/etc
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-03-10 15:01:39 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-20 15:22:29 +0000
commitb12472ffd9ffdd6d8ff79d71167a5600bb80e642 (patch)
treed60cd5f88abc68d5124a71b149853bdb2f65ff72 /openstack/etc
parent761cf21367f393d522a2dae38531246a33d5a0fa (diff)
downloaddefinitions-b12472ffd9ffdd6d8ff79d71167a5600bb80e642.tar.gz
Move patch link creation into openvswitch
This is required for Open vSwitch to be able to signal that every network interface required has been configured. It also means we no longer need to set the links to promiscuous mode ourselves, since interfaces need to be set in promiscuous mode to allow bridging to work and Open vSwitch handles this responsibility if it is configured to be the one to do the link setup.
Diffstat (limited to 'openstack/etc')
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-server.service4
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-setup.service4
-rw-r--r--openstack/etc/systemd/system/openvswitch-create-links-one-node.service14
3 files changed, 4 insertions, 18 deletions
diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/etc/systemd/system/openstack-neutron-server.service
index b9484b94..c8e816a5 100644
--- a/openstack/etc/systemd/system/openstack-neutron-server.service
+++ b/openstack/etc/systemd/system/openstack-neutron-server.service
@@ -1,7 +1,7 @@
[Unit]
Description=Neutron Api Server
-Wants=openvswitch-create-links-one-node.service
-After=network-online.target openstack-neutron-setup.service openvswitch-create-links-one-node.service
+Wants=openstack-neutron-network-configuration-one-node.service
+After=network-online.target openstack-neutron-setup.service openstack-neutron-network-configuration-one-node.service
[Service]
Type=simple
diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service
index 4c09907e..858e76e9 100644
--- a/openstack/etc/systemd/system/openstack-neutron-setup.service
+++ b/openstack/etc/systemd/system/openstack-neutron-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run openstack-neutron-setup (once)
-Wants=openvswitch-create-links-one-node.service
-After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service
+Wants=openstack-neutron-network-configuration-one-node.service
+After=network-online.target openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service postgres-server.service
[Service]
Type=oneshot
diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
deleted file mode 100644
index bacfc433..00000000
--- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Create Veth pairs
-Wants=openstack-neutron-network-configuration-one-node.service
-After=network-online.target openstack-neutron-network-configuration-one-node.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs
-RemainAfterExit=yes
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
-