summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-07 13:53:25 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 15:48:13 +0000
commit8906353c8ae7f9fbfb43db82f8a6735d74123659 (patch)
treeeb47dfee2fe24cb3e101b3bd7949860bf0140dd9
parent141e38861a5cf3e462ca45ed50d80ddf0f36e38b (diff)
downloaddefinitions-8906353c8ae7f9fbfb43db82f8a6735d74123659.tar.gz
Unify openstack-network setup and openvswitch configure extensions.
If a system needs network configuration, it will also need openvswitch configured.
-rw-r--r--openstack-network.configure (renamed from openvswitch.configure)3
-rw-r--r--systems/openstack-server.morph2
2 files changed, 4 insertions, 1 deletions
diff --git a/openvswitch.configure b/openstack-network.configure
index 7e64de69..7f2a08cc 100644
--- a/openvswitch.configure
+++ b/openstack-network.configure
@@ -21,3 +21,6 @@ ROOT="$1"
ln -sf "/usr/lib/systemd/system/openvswitch-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openvswitch-setup.service"
+
+ln -sf "/usr/lib/systemd/system/openstack-network-setup.service" \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-network-setup.service"
diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph
index e493e725..5e6499a0 100644
--- a/systems/openstack-server.morph
+++ b/systems/openstack-server.morph
@@ -67,5 +67,5 @@ configuration-extensions:
- openstack-nova
- openstack-cinder
- openstack-neutron
-- openvswitch
+- openstack-network
- hosts