summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2016-10-06 13:33:21 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2016-10-06 13:34:47 -0500
commit0f4820951af6654ccaa79d9298b6c1c99028e1e1 (patch)
treee94cb8fa99f0d57ae0eb657a5ff5d783cc9410bd /sys-cluster
parentsys-cluster/cinder: cleanup (diff)
downloadgentoo-0f4820951af6654ccaa79d9298b6c1c99028e1e1.tar.gz
gentoo-0f4820951af6654ccaa79d9298b6c1c99028e1e1.tar.bz2
gentoo-0f4820951af6654ccaa79d9298b6c1c99028e1e1.zip
sys-cluster/neutron: cleanup
Package-Manager: portage-2.3.0
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/neutron/files/neutron-linuxbridge-agent.confd2
-rw-r--r--sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty1
-rw-r--r--sys-cluster/neutron/files/neutron-ovs-cleanup.confd1
-rw-r--r--sys-cluster/neutron/neutron-2016.1.9999.ebuild2
-rw-r--r--sys-cluster/neutron/neutron-2016.2.9999.ebuild2
-rw-r--r--sys-cluster/neutron/neutron-8.2.0.ebuild2
-rw-r--r--sys-cluster/neutron/neutron-9.0.0.ebuild2
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 fdd4ed4865b4..9a2d52c70f8a 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 9a2d52c70f8a..000000000000
--- 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 eba422c2c716..000000000000
--- 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 e0eda23d6bd2..bff65d219c61 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 1a66a80fdc8e..726e0f2943cc 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 943ebb5e4189..a8d6d24a41ed 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 5928506bddf9..c77faa3ade9e 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