[gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/, sys-cluster/neutron/files/

[Matt Thode]

commit:     0f4820951af6654ccaa79d9298b6c1c99028e1e1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 18:33:21 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 18:34:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f482095

sys-cluster/neutron: cleanup

Package-Manager: portage-2.3.0

 sys-cluster/neutron/files/neutron-linuxbridge-agent.confd         | 2 +-
 sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty | 1 -
 sys-cluster/neutron/files/neutron-ovs-cleanup.confd               | 1 -
 sys-cluster/neutron/neutron-2016.1.9999.ebuild                    | 2 +-
 sys-cluster/neutron/neutron-2016.2.9999.ebuild                    | 2 +-
 sys-cluster/neutron/neutron-8.2.0.ebuild                          | 2 +-
 sys-cluster/neutron/neutron-9.0.0.ebuild                          | 2 +-
 7 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd 
b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
index fdd4ed4..9a2d52c 100644
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
@@ -1 +1 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" 
"/etc/neutron/plugins/ml2/ml2_conf.ini" 
"/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" 
"/etc/neutron/plugins/ml2/ml2_conf.ini" 
"/etc/neutron/plugins/ml2/linuxbridge_agent.ini")

diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty 
b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
deleted file mode 100644
index 9a2d52c..00000000
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" 
"/etc/neutron/plugins/ml2/ml2_conf.ini" 
"/etc/neutron/plugins/ml2/linuxbridge_agent.ini")

diff --git a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd 
b/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
deleted file mode 100644
index eba422c..00000000
--- a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" 
"/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")

diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild 
b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
index e0eda23..bff65d2 100644
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
@@ -167,7 +167,7 @@ python_install() {
        fi
        if use linuxbridge; then
                newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" 
"neutron-linuxbridge-agent"
+               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
        fi
        diropts -m 755 -o neutron -g neutron
        dodir /var/log/neutron /var/lib/neutron

diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild 
b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
index 1a66a80..726e0f2 100644
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
@@ -180,7 +180,7 @@ python_install() {
        fi
        if use linuxbridge; then
                newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" 
"neutron-linuxbridge-agent"
+               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
        fi
        diropts -m 755 -o neutron -g neutron
        dodir /var/log/neutron /var/lib/neutron

diff --git a/sys-cluster/neutron/neutron-8.2.0.ebuild 
b/sys-cluster/neutron/neutron-8.2.0.ebuild
index 943ebb5..a8d6d24 100644
--- a/sys-cluster/neutron/neutron-8.2.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.2.0.ebuild
@@ -166,7 +166,7 @@ python_install() {
        fi
        if use linuxbridge; then
                newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" 
"neutron-linuxbridge-agent"
+               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
        fi
        diropts -m 755 -o neutron -g neutron
        dodir /var/log/neutron /var/lib/neutron

diff --git a/sys-cluster/neutron/neutron-9.0.0.ebuild 
b/sys-cluster/neutron/neutron-9.0.0.ebuild
index 5928506..c77faa3 100644
--- a/sys-cluster/neutron/neutron-9.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-9.0.0.ebuild
@@ -179,7 +179,7 @@ python_install() {
        fi
        if use linuxbridge; then
                newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" 
"neutron-linuxbridge-agent"
+               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
        fi
        diropts -m 755 -o neutron -g neutron
        dodir /var/log/neutron /var/lib/neutron