From e1f899a47d3a6fcd5d0816a60a669f15e875dea5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 31 Jul 2015 22:35:17 +0000 Subject: [PATCH] Handles the rename of the openvswitch_agent.ini Rewritten-From: dd7b8162de79fc39421c64d534150579c1010a5c --- xenial/debian/neutron-common.README.Debian | 2 +- xenial/debian/neutron-common.config.in | 2 +- xenial/debian/neutron-common.postinst.in | 4 ++-- xenial/debian/neutron-common.postrm | 4 ++-- xenial/debian/neutron-openvswitch-agent.init.in | 2 +- xenial/debian/plugin_guess_func | 2 +- xenial/debian/rules | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xenial/debian/neutron-common.README.Debian b/xenial/debian/neutron-common.README.Debian index c5d8c2c67..aa01f1455 100644 --- a/xenial/debian/neutron-common.README.Debian +++ b/xenial/debian/neutron-common.README.Debian @@ -21,7 +21,7 @@ course your public IP address of the router which will deliver network to your virtual machines. With this setup, using tenant_network_type = gre and enable_tunneling = True -in /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini, which is the +in /etc/neutron/plugins/ml2/openvswitch_agent.ini, which is the default in this package, should work. -- Thomas Goirand Sat, 03 Nov 2012 14:01:32 +0000 diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in index 99ca227bc..c179765b7 100644 --- a/xenial/debian/neutron-common.config.in +++ b/xenial/debian/neutron-common.config.in @@ -5,7 +5,7 @@ set -e . /usr/share/debconf/confmodule N_CONF=/etc/neutron/neutron.conf -OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +OVS_CONF=/etc/neutron/plugins/ml2/openvswitch_agent.ini # Please remember this function is also in debian/plugin_guess_func neutron_core_plugin_to_plugin_name () { diff --git a/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in index 1c44355be..07bf75cbb 100644 --- a/xenial/debian/neutron-common.postinst.in +++ b/xenial/debian/neutron-common.postinst.in @@ -3,7 +3,7 @@ set -e N_CONF=/etc/neutron/neutron.conf -OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +OVS_CONF=/etc/neutron/plugins/ml2/openvswitch_agent.ini #PKGOS-INCLUDE# @@ -105,7 +105,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then # Maintain the OVS config if [ ! -e ${OVS_CONF} ] ; then - install -D -m 0640 -o neutron -g neutron /usr/share/neutron-common/ovs_neutron_plugin.ini ${OVS_CONF} + install -D -m 0640 -o neutron -g neutron /usr/share/neutron-common/openvswitch_agent.ini ${OVS_CONF} fi if [ "${NEUTRON_plugin_path}" = "OpenVSwitch" ] ; then diff --git a/xenial/debian/neutron-common.postrm b/xenial/debian/neutron-common.postrm index c5673e4b6..75520af18 100644 --- a/xenial/debian/neutron-common.postrm +++ b/xenial/debian/neutron-common.postrm @@ -23,8 +23,8 @@ if [ "${1}" = "purge" ] ; then # Clean /etc/neutron on purge rm -f /etc/default/neutron /etc/neutron/api-paste.ini /etc/neutron/neutron.conf \ - /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini - [ -d /etc/neutron/plugins/openvswitch ] && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins/openvswitch + /etc/neutron/plugins/openvswitch/ml2/openvswitch_agent.ini + [ -d /etc/neutron/plugins/ml2 ] && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins/ml2 [ -d /etc/neutron/plugins ] && rmdir --ignore-fail-on-non-empty /etc/neutron/plugins [ -d /etc/neutron ] && rmdir --ignore-fail-on-non-empty /etc/neutron rm -rf /var/lib/neutron diff --git a/xenial/debian/neutron-openvswitch-agent.init.in b/xenial/debian/neutron-openvswitch-agent.init.in index 53c815414..bc6af291d 100644 --- a/xenial/debian/neutron-openvswitch-agent.init.in +++ b/xenial/debian/neutron-openvswitch-agent.init.in @@ -16,7 +16,7 @@ DESC="Openstack Neutron OpenVSwitch Plugin Agent" PROJECT_NAME=neutron NAME=${PROJECT_NAME}-openvswitch-agent -CONFIG_FILE=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +CONFIG_FILE=/etc/neutron/plugins/ml2/openvswitch_agent.ini # Since Juno OVS plugin as been deprecated as core_plugin, it has been # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory diff --git a/xenial/debian/plugin_guess_func b/xenial/debian/plugin_guess_func index 35bc6c5c2..1dfa5244d 100644 --- a/xenial/debian/plugin_guess_func +++ b/xenial/debian/plugin_guess_func @@ -59,7 +59,7 @@ neutron_plugin_ini_path () { PLUG_INI_BASE=/etc/neutron/plugins/ case ${1} in "OpenVSwitch") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}openvswitch/ovs_neutron_plugin.ini + NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}ml2/openvswitch_agent.ini ;; "LinuxBridge") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}linuxbridge/linuxbridge_conf.ini diff --git a/xenial/debian/rules b/xenial/debian/rules index 7f27d99b9..9dd08e3b1 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -29,14 +29,14 @@ override_dh_install: rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum* rm -rf $(CURDIR)/debian/neutron-common/usr/etc - install -D -m 0640 etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/ovs_neutron_plugin.ini + install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini install -D -m 0640 etc/metadata_agent.ini $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini sed -i -e 's|^# nova_metadata_ip = 127.0.0.1|nova_metadata_ip = 127.0.0.1|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini # Move the OVS config file, since we use debconf for it - rm $(CURDIR)/debian/neutron-common/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini - install -D -m 0640 etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/ovs_neutron_plugin.ini + rm $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/openvswitch_agent.ini + install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini override_dh_auto_clean: dh_auto_clean -- 2.32.3