diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-03-10 15:01:39 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-08 18:29:25 +0100 |
| commit | c55e9ca98d65d32e9ce28e568a8b62aeeb7189d2 (patch) | |
| tree | d83bc0f3cd8f9b313c5fd0bc33f5b0a6a35d3768 /openstack/etc | |
| parent | aae3446299cfdd7cb4d40e9da681129f7dfbd5f2 (diff) | |
| download | definitions-c55e9ca98d65d32e9ce28e568a8b62aeeb7189d2.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')
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 - |