| 1 |
commit: 0f4820951af6654ccaa79d9298b6c1c99028e1e1 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 18:33:21 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 18:34:47 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f482095 |
| 7 |
|
| 8 |
sys-cluster/neutron: cleanup |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-cluster/neutron/files/neutron-linuxbridge-agent.confd | 2 +- |
| 13 |
sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty | 1 - |
| 14 |
sys-cluster/neutron/files/neutron-ovs-cleanup.confd | 1 - |
| 15 |
sys-cluster/neutron/neutron-2016.1.9999.ebuild | 2 +- |
| 16 |
sys-cluster/neutron/neutron-2016.2.9999.ebuild | 2 +- |
| 17 |
sys-cluster/neutron/neutron-8.2.0.ebuild | 2 +- |
| 18 |
sys-cluster/neutron/neutron-9.0.0.ebuild | 2 +- |
| 19 |
7 files changed, 5 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd |
| 22 |
index fdd4ed4..9a2d52c 100644 |
| 23 |
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd |
| 24 |
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd |
| 25 |
@@ -1 +1 @@ |
| 26 |
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini") |
| 27 |
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini") |
| 28 |
|
| 29 |
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty |
| 30 |
deleted file mode 100644 |
| 31 |
index 9a2d52c..00000000 |
| 32 |
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty |
| 33 |
+++ /dev/null |
| 34 |
@@ -1 +0,0 @@ |
| 35 |
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini") |
| 36 |
|
| 37 |
diff --git a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd b/sys-cluster/neutron/files/neutron-ovs-cleanup.confd |
| 38 |
deleted file mode 100644 |
| 39 |
index eba422c..00000000 |
| 40 |
--- a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd |
| 41 |
+++ /dev/null |
| 42 |
@@ -1 +0,0 @@ |
| 43 |
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini") |
| 44 |
|
| 45 |
diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild b/sys-cluster/neutron/neutron-2016.1.9999.ebuild |
| 46 |
index e0eda23..bff65d2 100644 |
| 47 |
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild |
| 48 |
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild |
| 49 |
@@ -167,7 +167,7 @@ python_install() { |
| 50 |
fi |
| 51 |
if use linuxbridge; then |
| 52 |
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
| 53 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent" |
| 54 |
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
| 55 |
fi |
| 56 |
diropts -m 755 -o neutron -g neutron |
| 57 |
dodir /var/log/neutron /var/lib/neutron |
| 58 |
|
| 59 |
diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 60 |
index 1a66a80..726e0f2 100644 |
| 61 |
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 62 |
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 63 |
@@ -180,7 +180,7 @@ python_install() { |
| 64 |
fi |
| 65 |
if use linuxbridge; then |
| 66 |
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
| 67 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent" |
| 68 |
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
| 69 |
fi |
| 70 |
diropts -m 755 -o neutron -g neutron |
| 71 |
dodir /var/log/neutron /var/lib/neutron |
| 72 |
|
| 73 |
diff --git a/sys-cluster/neutron/neutron-8.2.0.ebuild b/sys-cluster/neutron/neutron-8.2.0.ebuild |
| 74 |
index 943ebb5..a8d6d24 100644 |
| 75 |
--- a/sys-cluster/neutron/neutron-8.2.0.ebuild |
| 76 |
+++ b/sys-cluster/neutron/neutron-8.2.0.ebuild |
| 77 |
@@ -166,7 +166,7 @@ python_install() { |
| 78 |
fi |
| 79 |
if use linuxbridge; then |
| 80 |
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
| 81 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent" |
| 82 |
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
| 83 |
fi |
| 84 |
diropts -m 755 -o neutron -g neutron |
| 85 |
dodir /var/log/neutron /var/lib/neutron |
| 86 |
|
| 87 |
diff --git a/sys-cluster/neutron/neutron-9.0.0.ebuild b/sys-cluster/neutron/neutron-9.0.0.ebuild |
| 88 |
index 5928506..c77faa3 100644 |
| 89 |
--- a/sys-cluster/neutron/neutron-9.0.0.ebuild |
| 90 |
+++ b/sys-cluster/neutron/neutron-9.0.0.ebuild |
| 91 |
@@ -179,7 +179,7 @@ python_install() { |
| 92 |
fi |
| 93 |
if use linuxbridge; then |
| 94 |
newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
| 95 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent" |
| 96 |
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
| 97 |
fi |
| 98 |
diropts -m 755 -o neutron -g neutron |
| 99 |
dodir /var/log/neutron /var/lib/neutron |
Archives