sys-cluster/neutron: cleanup

Package-Manager: portage-2.3.0

diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
index fdd4ed4865b4d9076d5aeeb339497973eddbffc6..9a2d52c70f8a2ecd69d1cf2521d6a145d0a87476 100644 (file)
--- 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 (file)
index 9a2d52c..0000000
--- 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 (file)
index eba422c..0000000
--- 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 e0eda23d6bd2ce9f92269bedcc219a078f5d2bee..bff65d219c61f6456c4b3a5457688d6670b3fb04 100644 (file)
--- 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 1a66a80fdc8e8421e42a63f53f5d93cec74200de..726e0f2943ccd65ac250481c84a9f431965c4903 100644 (file)
--- 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 943ebb5e41892db549caec86425bcf2432c5b512..a8d6d24a41edaec7ca210ee945a012d4f1ea8b15 100644 (file)
--- 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 5928506bddf9f7311335217214dc2b4c1cf54bde..c77faa3ade9e605a0484b2ca1f81fa71c0bd178a 100644 (file)
--- 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