From 199faabd6c2b43ddc729bdd1a70c739af74894bd Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 7 Apr 2015 13:53:25 +0000 Subject: Unify openstack-network setup and openvswitch configure extensions. If a system needs network configuration, it will also need openvswitch configured. --- openstack-network.configure | 26 ++++++++++++++++++++++++++ openvswitch.configure | 23 ----------------------- systems/openstack-server.morph | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 openstack-network.configure delete mode 100644 openvswitch.configure diff --git a/openstack-network.configure b/openstack-network.configure new file mode 100644 index 00000000..7f2a08cc --- /dev/null +++ b/openstack-network.configure @@ -0,0 +1,26 @@ +#!/bin/sh + +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +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/openvswitch.configure b/openvswitch.configure deleted file mode 100644 index 7e64de69..00000000 --- a/openvswitch.configure +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2015 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -e - -ROOT="$1" - -ln -sf "/usr/lib/systemd/system/openvswitch-setup.service" \ - "$ROOT/etc/systemd/system/multi-user.target.wants/openvswitch-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 -- cgit v1.2.1