1 |
commit: a799b22ff524b58d7fd16be5853bc906611c1a04 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 03:46:36 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 04:13:03 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a799b22f |
7 |
|
8 |
sys-cluster/neutron: remove ocata |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-cluster/neutron/Manifest | 5 - |
13 |
sys-cluster/neutron/files/neutron.initd | 13 +- |
14 |
sys-cluster/neutron/files/neutron.initd-2 | 17 -- |
15 |
sys-cluster/neutron/neutron-10.0.4.ebuild | 237 ------------------------ |
16 |
sys-cluster/neutron/neutron-11.0.2.ebuild | 16 +- |
17 |
sys-cluster/neutron/neutron-2017.1.9999.ebuild | 238 ------------------------- |
18 |
sys-cluster/neutron/neutron-2017.2.9999.ebuild | 16 +- |
19 |
7 files changed, 21 insertions(+), 521 deletions(-) |
20 |
|
21 |
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest |
22 |
index c1f6082d504..816c282aab8 100644 |
23 |
--- a/sys-cluster/neutron/Manifest |
24 |
+++ b/sys-cluster/neutron/Manifest |
25 |
@@ -1,10 +1,5 @@ |
26 |
-DIST neutron-10.0.4.tar.gz 3124422 BLAKE2B 76dc1f5f6031cb98e4e03bfd91a3f2ee5512566306ff48f8bcd2f21d6d21b308418f746e8d01185adfb049f8d06f03e149d60595977052f92b593baf0e04dbaf SHA512 f85949ac08728b6338cf58abfaf2c9e67882d49fefa16104580c73aaea3f0634602712583e88248f261fd3b0c8690172e4a72f550bd159cacf732440274cc844 |
27 |
DIST neutron-11.0.2.tar.gz 10481255 BLAKE2B 3e2ca3e7e24f21d92823b3d2e44d3fabe17d40cac493797a960b7c20fd906f3bd8ca946ca0729f8e03079f6615e2094f9228a01c2fc1e79ab2cf63bd2a8a5b36 SHA512 ba86e6448d0ae6e95dd4caa41888ee3d4ceeb4353b655b20912871e05cc2440f7d54bef7b119e1cec98da8fe3b9f22966ca8ad05dc3a5931b66b776bef9240cf |
28 |
-DIST neutron-configs-10.0.4.tar.gz 25094 BLAKE2B 879b3178f6688d04b62843889ce97d8d99eed311d2401119ad9ca526ff8a3166decfbd94b523ce46587c0bcf146d7f433051d4c55719257ba6d88aacf6a71d46 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d |
29 |
DIST neutron-configs-11.0.2.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a |
30 |
-DIST neutron-configs-2017.1.9999.tar.gz 25094 BLAKE2B 879b3178f6688d04b62843889ce97d8d99eed311d2401119ad9ca526ff8a3166decfbd94b523ce46587c0bcf146d7f433051d4c55719257ba6d88aacf6a71d46 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d |
31 |
DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a |
32 |
-DIST neutron-ml2-plugins-10.0.4.tar.gz 6811 BLAKE2B c6ee0b9f03d9af349da8bdbcc3b9b55b8ca72ec5fd8326ac91879b5f0523d8d0787e5b36ece88c6ed812c94d33eb853dd3c28958f8685a9dc8a51581bc7443e1 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb |
33 |
DIST neutron-ml2-plugins-11.0.2.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd |
34 |
-DIST neutron-ml2-plugins-2017.1.9999.tar.gz 6811 BLAKE2B c6ee0b9f03d9af349da8bdbcc3b9b55b8ca72ec5fd8326ac91879b5f0523d8d0787e5b36ece88c6ed812c94d33eb853dd3c28958f8685a9dc8a51581bc7443e1 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb |
35 |
DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd |
36 |
|
37 |
diff --git a/sys-cluster/neutron/files/neutron.initd b/sys-cluster/neutron/files/neutron.initd |
38 |
index 803ccb58f70..26bf768ddff 100644 |
39 |
--- a/sys-cluster/neutron/files/neutron.initd |
40 |
+++ b/sys-cluster/neutron/files/neutron.initd |
41 |
@@ -1,20 +1,17 @@ |
42 |
#!/sbin/openrc-run |
43 |
-# Copyright 1999-2014 Gentoo Foundation |
44 |
+# Copyright 1999-2018 Gentoo Foundation |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
description="Starts ${SVCNAME} service for OpenStack" |
48 |
|
49 |
command=/usr/bin/"${SVCNAME}" |
50 |
command_background=yes |
51 |
-pidfile=/var/run/neutron/"${SVCNAME}".pid |
52 |
+command_user="${NEUTRON_USER:-neutron}" |
53 |
+pidfile=/run/"${SVCNAME}".pid |
54 |
required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) |
55 |
-command_args="${required_files[@]/#/--config-file } --log-file /var/log/neutron/${SVCNAME#*-}.log" |
56 |
-start_stop_daemon_args="--quiet --user ${NEUTRON_USER:-neutron}" |
57 |
+command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" |
58 |
+retry="SIGTERM/15" |
59 |
|
60 |
depend() { |
61 |
need net |
62 |
} |
63 |
- |
64 |
-start_pre() { |
65 |
- checkpath --directory --owner "${NEUTRON_USER:-neutron}":"${NEUTRON_GROUP:-neutron}" --mode 0755 "${NEUTRON_RUN:-/var/run/neutron}" |
66 |
-} |
67 |
|
68 |
diff --git a/sys-cluster/neutron/files/neutron.initd-2 b/sys-cluster/neutron/files/neutron.initd-2 |
69 |
deleted file mode 100644 |
70 |
index 7a7dad6e686..00000000000 |
71 |
--- a/sys-cluster/neutron/files/neutron.initd-2 |
72 |
+++ /dev/null |
73 |
@@ -1,17 +0,0 @@ |
74 |
-#!/sbin/openrc-run |
75 |
-# Copyright 1999-2017 Gentoo Foundation |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-description="Starts ${SVCNAME} service for OpenStack" |
79 |
- |
80 |
-command=/usr/bin/"${SVCNAME}" |
81 |
-command_background=yes |
82 |
-command_user="${NEUTRON_USER:-neutron}" |
83 |
-pidfile=/run/"${SVCNAME}".pid |
84 |
-required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf}) |
85 |
-command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log" |
86 |
-retry="SIGTERM/15" |
87 |
- |
88 |
-depend() { |
89 |
- need net |
90 |
-} |
91 |
|
92 |
diff --git a/sys-cluster/neutron/neutron-10.0.4.ebuild b/sys-cluster/neutron/neutron-10.0.4.ebuild |
93 |
deleted file mode 100644 |
94 |
index 482826b624b..00000000000 |
95 |
--- a/sys-cluster/neutron/neutron-10.0.4.ebuild |
96 |
+++ /dev/null |
97 |
@@ -1,237 +0,0 @@ |
98 |
-# Copyright 1999-2017 Gentoo Foundation |
99 |
-# Distributed under the terms of the GNU General Public License v2 |
100 |
- |
101 |
-EAPI=6 |
102 |
-PYTHON_COMPAT=( python2_7 ) |
103 |
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 |
104 |
- |
105 |
-inherit distutils-r1 linux-info user |
106 |
- |
107 |
-DESCRIPTION="A virtual network service for Openstack" |
108 |
-HOMEPAGE="https://launchpad.net/neutron" |
109 |
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz |
110 |
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz |
111 |
- https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
112 |
- |
113 |
-LICENSE="Apache-2.0" |
114 |
-SLOT="0" |
115 |
-KEYWORDS="amd64 ~arm64 x86" |
116 |
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
117 |
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) |
118 |
- compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server |
119 |
- || ( openvswitch linuxbridge ) )" |
120 |
- |
121 |
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
122 |
-DEPEND=" |
123 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
124 |
- ${CDEPEND} |
125 |
- app-admin/sudo" |
126 |
- |
127 |
-RDEPEND=" |
128 |
- ${CDEPEND} |
129 |
- dev-python/paste[${PYTHON_USEDEP}] |
130 |
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
131 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
132 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
133 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
134 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
135 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
136 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
137 |
- >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}] |
138 |
- !~dev-python/pecan-1.0.2[${PYTHON_USEDEP}] |
139 |
- !~dev-python/pecan-1.0.3[${PYTHON_USEDEP}] |
140 |
- !~dev-python/pecan-1.0.4[${PYTHON_USEDEP}] |
141 |
- !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] |
142 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
143 |
- >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] |
144 |
- !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
145 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
146 |
- !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] |
147 |
- !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] |
148 |
- !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] |
149 |
- !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] |
150 |
- !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] |
151 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
152 |
- >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] |
153 |
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
154 |
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] |
155 |
- >=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}] |
156 |
- >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] |
157 |
- >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] |
158 |
- >=dev-python/ryu-4.9[${PYTHON_USEDEP}] |
159 |
- compute-only? ( |
160 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
161 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
162 |
- ) |
163 |
- sqlite? ( |
164 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
165 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
166 |
- ) |
167 |
- mysql? ( |
168 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
169 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
170 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
171 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
172 |
- ) |
173 |
- postgres? ( |
174 |
- >=dev-python/psycopg-2.5.0 |
175 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
176 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
177 |
- ) |
178 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
179 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
180 |
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
181 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
182 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
183 |
- >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] |
184 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
185 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
186 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
187 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
188 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
189 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
190 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
191 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
192 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
193 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
194 |
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
195 |
- >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
196 |
- >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
197 |
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
198 |
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
199 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
200 |
- >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
201 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
202 |
- >=dev-python/ovs-2.6.1[${PYTHON_USEDEP}] |
203 |
- >=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}] |
204 |
- >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] |
205 |
- >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] |
206 |
- !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] |
207 |
- >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] |
208 |
- virtual/python-singledispatch[${PYTHON_USEDEP}] |
209 |
- dev-python/pyudev[${PYTHON_USEDEP}] |
210 |
- sys-apps/iproute2 |
211 |
- net-misc/iputils[arping] |
212 |
- net-misc/bridge-utils |
213 |
- net-firewall/ipset |
214 |
- net-firewall/iptables |
215 |
- net-firewall/ebtables |
216 |
- net-firewall/conntrack-tools |
217 |
- openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) |
218 |
- ipv6? ( |
219 |
- net-misc/radvd |
220 |
- >=net-misc/dibbler-1.0.1 |
221 |
- ) |
222 |
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )" |
223 |
- |
224 |
-#PATCHES=( |
225 |
-#) |
226 |
- |
227 |
-pkg_pretend() { |
228 |
- linux-info_pkg_setup |
229 |
- CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ |
230 |
- IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ |
231 |
- NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" |
232 |
- if linux_config_exists; then |
233 |
- for module in ${CONFIG_CHECK_MODULES}; do |
234 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" |
235 |
- done |
236 |
- fi |
237 |
-} |
238 |
- |
239 |
-pkg_setup() { |
240 |
- enewgroup neutron |
241 |
- enewuser neutron -1 -1 /var/lib/neutron neutron |
242 |
-} |
243 |
- |
244 |
-pkg_config() { |
245 |
- fperms 0700 /var/log/neutron |
246 |
- fowners neutron:neutron /var/log neutron |
247 |
-} |
248 |
- |
249 |
-src_prepare() { |
250 |
- sed -i '/^hacking/d' test-requirements.txt || die |
251 |
- # it's /bin/ip not /sbin/ip |
252 |
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die |
253 |
- distutils-r1_python_prepare_all |
254 |
-} |
255 |
- |
256 |
-python_install_all() { |
257 |
- distutils-r1_python_install_all |
258 |
- if use server; then |
259 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
260 |
- newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
261 |
- dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
262 |
- fi |
263 |
- if use dhcp; then |
264 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
265 |
- newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" |
266 |
- fi |
267 |
- if use l3; then |
268 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" |
269 |
- newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" |
270 |
- fi |
271 |
- if use metadata; then |
272 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" |
273 |
- newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" |
274 |
- fi |
275 |
- if use openvswitch; then |
276 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" |
277 |
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" |
278 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" |
279 |
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" |
280 |
- fi |
281 |
- if use linuxbridge; then |
282 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
283 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
284 |
- fi |
285 |
- diropts -m 755 -o neutron -g neutron |
286 |
- dodir /var/log/neutron /var/lib/neutron |
287 |
- keepdir /etc/neutron |
288 |
- insinto /etc/neutron |
289 |
- insopts -m 0640 -o neutron -g neutron |
290 |
- |
291 |
- doins etc/* |
292 |
- # stupid renames |
293 |
- insinto /etc/neutron |
294 |
- doins -r "etc/neutron/plugins" |
295 |
- insopts -m 0640 -o root -g root |
296 |
- doins "etc/rootwrap.conf" |
297 |
- doins -r "etc/neutron/rootwrap.d" |
298 |
- |
299 |
- #add sudoers definitions for user neutron |
300 |
- insinto /etc/sudoers.d/ |
301 |
- insopts -m 0440 -o root -g root |
302 |
- newins "${FILESDIR}/neutron.sudoersd" neutron |
303 |
- |
304 |
- # add generated configs |
305 |
- cd "${D}/etc/neutron" || die |
306 |
- unpack "neutron-configs-${PV}.tar.gz" |
307 |
- cd "${D}/etc/neutron/plugins/ml2" || die |
308 |
- unpack "neutron-ml2-plugins-${PV}.tar.gz" |
309 |
- |
310 |
- # correcting perms |
311 |
- fowners neutron:neutron -R "/etc/neutron" |
312 |
- fperms o-rwx -R "/etc/neutron/" |
313 |
- |
314 |
- #remove superfluous stuff |
315 |
- rm -R "${D}/usr/etc/" |
316 |
-} |
317 |
- |
318 |
-python_install() { |
319 |
- distutils-r1_python_install |
320 |
- # copy migration conf file (not coppied on install via setup.py script) |
321 |
- insopts -m 0644 |
322 |
- insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" |
323 |
- doins -r "neutron/db/migration/alembic_migrations/versions" |
324 |
-} |
325 |
- |
326 |
-pkg_postinst() { |
327 |
- elog |
328 |
- elog "neutron-server's conf.d file may need updating to include additional ini files" |
329 |
- elog "We currently assume the ml2 plugin will be used but do not make assumptions" |
330 |
- elog "on if you will use openvswitch or linuxbridge (or something else)" |
331 |
- elog |
332 |
- elog "Other conf.d files may need updating too, but should be good for the default use case" |
333 |
- elog |
334 |
-} |
335 |
|
336 |
diff --git a/sys-cluster/neutron/neutron-11.0.2.ebuild b/sys-cluster/neutron/neutron-11.0.2.ebuild |
337 |
index 575c14d4433..cb3c6335654 100644 |
338 |
--- a/sys-cluster/neutron/neutron-11.0.2.ebuild |
339 |
+++ b/sys-cluster/neutron/neutron-11.0.2.ebuild |
340 |
@@ -1,4 +1,4 @@ |
341 |
-# Copyright 1999-2017 Gentoo Foundation |
342 |
+# Copyright 1999-2018 Gentoo Foundation |
343 |
# Distributed under the terms of the GNU General Public License v2 |
344 |
|
345 |
EAPI=6 |
346 |
@@ -177,30 +177,30 @@ src_prepare() { |
347 |
python_install_all() { |
348 |
distutils-r1_python_install_all |
349 |
if use server; then |
350 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-server" |
351 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
352 |
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
353 |
dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
354 |
fi |
355 |
if use dhcp; then |
356 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent" |
357 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
358 |
newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" |
359 |
fi |
360 |
if use l3; then |
361 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent" |
362 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" |
363 |
newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" |
364 |
fi |
365 |
if use metadata; then |
366 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent" |
367 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" |
368 |
newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" |
369 |
fi |
370 |
if use openvswitch; then |
371 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-openvswitch-agent" |
372 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" |
373 |
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" |
374 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup" |
375 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" |
376 |
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" |
377 |
fi |
378 |
if use linuxbridge; then |
379 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-linuxbridge-agent" |
380 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
381 |
newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
382 |
fi |
383 |
diropts -m 755 -o neutron -g neutron |
384 |
|
385 |
diff --git a/sys-cluster/neutron/neutron-2017.1.9999.ebuild b/sys-cluster/neutron/neutron-2017.1.9999.ebuild |
386 |
deleted file mode 100644 |
387 |
index 1872be64f63..00000000000 |
388 |
--- a/sys-cluster/neutron/neutron-2017.1.9999.ebuild |
389 |
+++ /dev/null |
390 |
@@ -1,238 +0,0 @@ |
391 |
-# Copyright 1999-2017 Gentoo Foundation |
392 |
-# Distributed under the terms of the GNU General Public License v2 |
393 |
- |
394 |
-EAPI=6 |
395 |
-PYTHON_COMPAT=( python2_7 ) |
396 |
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 |
397 |
- |
398 |
-inherit distutils-r1 git-r3 linux-info user |
399 |
- |
400 |
-DESCRIPTION="A virtual network service for Openstack" |
401 |
-HOMEPAGE="https://launchpad.net/neutron" |
402 |
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz |
403 |
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz" |
404 |
-EGIT_REPO_URI="https://github.com/openstack/neutron.git" |
405 |
-EGIT_BRANCH="stable/ocata" |
406 |
- |
407 |
-LICENSE="Apache-2.0" |
408 |
-SLOT="0" |
409 |
-KEYWORDS="" |
410 |
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" |
411 |
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) |
412 |
- compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server |
413 |
- || ( openvswitch linuxbridge ) )" |
414 |
- |
415 |
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
416 |
-DEPEND=" |
417 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
418 |
- ${CDEPEND} |
419 |
- app-admin/sudo" |
420 |
- |
421 |
-RDEPEND=" |
422 |
- ${CDEPEND} |
423 |
- dev-python/paste[${PYTHON_USEDEP}] |
424 |
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] |
425 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
426 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
427 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
428 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
429 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
430 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
431 |
- >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}] |
432 |
- !~dev-python/pecan-1.0.2[${PYTHON_USEDEP}] |
433 |
- !~dev-python/pecan-1.0.3[${PYTHON_USEDEP}] |
434 |
- !~dev-python/pecan-1.0.4[${PYTHON_USEDEP}] |
435 |
- !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] |
436 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
437 |
- >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] |
438 |
- !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
439 |
- >=dev-python/jinja-2.8[${PYTHON_USEDEP}] |
440 |
- !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}] |
441 |
- !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}] |
442 |
- !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}] |
443 |
- !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}] |
444 |
- !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}] |
445 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
446 |
- >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}] |
447 |
- !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
448 |
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] |
449 |
- >=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}] |
450 |
- >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}] |
451 |
- >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] |
452 |
- >=dev-python/ryu-4.9[${PYTHON_USEDEP}] |
453 |
- compute-only? ( |
454 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
455 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
456 |
- ) |
457 |
- sqlite? ( |
458 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
459 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
460 |
- ) |
461 |
- mysql? ( |
462 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
463 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
464 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
465 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
466 |
- ) |
467 |
- postgres? ( |
468 |
- >=dev-python/psycopg-2.5.0 |
469 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
470 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
471 |
- ) |
472 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
473 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
474 |
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
475 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
476 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
477 |
- >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] |
478 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
479 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
480 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
481 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
482 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
483 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
484 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
485 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
486 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
487 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
488 |
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
489 |
- >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
490 |
- >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
491 |
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
492 |
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
493 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
494 |
- >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
495 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
496 |
- >=dev-python/ovs-2.6.1[${PYTHON_USEDEP}] |
497 |
- >=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}] |
498 |
- >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] |
499 |
- >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] |
500 |
- !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] |
501 |
- >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}] |
502 |
- virtual/python-singledispatch[${PYTHON_USEDEP}] |
503 |
- dev-python/pyudev[${PYTHON_USEDEP}] |
504 |
- sys-apps/iproute2 |
505 |
- net-misc/iputils[arping] |
506 |
- net-misc/bridge-utils |
507 |
- net-firewall/ipset |
508 |
- net-firewall/iptables |
509 |
- net-firewall/ebtables |
510 |
- net-firewall/conntrack-tools |
511 |
- openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) |
512 |
- ipv6? ( |
513 |
- net-misc/radvd |
514 |
- >=net-misc/dibbler-1.0.1 |
515 |
- ) |
516 |
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )" |
517 |
- |
518 |
-#PATCHES=( |
519 |
-#) |
520 |
- |
521 |
-pkg_pretend() { |
522 |
- linux-info_pkg_setup |
523 |
- CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ |
524 |
- IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ |
525 |
- NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" |
526 |
- if linux_config_exists; then |
527 |
- for module in ${CONFIG_CHECK_MODULES}; do |
528 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" |
529 |
- done |
530 |
- fi |
531 |
-} |
532 |
- |
533 |
-pkg_setup() { |
534 |
- enewgroup neutron |
535 |
- enewuser neutron -1 -1 /var/lib/neutron neutron |
536 |
-} |
537 |
- |
538 |
-pkg_config() { |
539 |
- fperms 0700 /var/log/neutron |
540 |
- fowners neutron:neutron /var/log neutron |
541 |
-} |
542 |
- |
543 |
-src_prepare() { |
544 |
- sed -i '/^hacking/d' test-requirements.txt || die |
545 |
- # it's /bin/ip not /sbin/ip |
546 |
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die |
547 |
- distutils-r1_python_prepare_all |
548 |
-} |
549 |
- |
550 |
-python_install_all() { |
551 |
- distutils-r1_python_install_all |
552 |
- if use server; then |
553 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
554 |
- newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
555 |
- dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
556 |
- fi |
557 |
- if use dhcp; then |
558 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
559 |
- newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" |
560 |
- fi |
561 |
- if use l3; then |
562 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" |
563 |
- newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" |
564 |
- fi |
565 |
- if use metadata; then |
566 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" |
567 |
- newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" |
568 |
- fi |
569 |
- if use openvswitch; then |
570 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" |
571 |
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" |
572 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" |
573 |
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" |
574 |
- fi |
575 |
- if use linuxbridge; then |
576 |
- newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
577 |
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
578 |
- fi |
579 |
- diropts -m 755 -o neutron -g neutron |
580 |
- dodir /var/log/neutron /var/lib/neutron |
581 |
- keepdir /etc/neutron |
582 |
- insinto /etc/neutron |
583 |
- insopts -m 0640 -o neutron -g neutron |
584 |
- |
585 |
- doins etc/* |
586 |
- # stupid renames |
587 |
- insinto /etc/neutron |
588 |
- doins -r "etc/neutron/plugins" |
589 |
- insopts -m 0640 -o root -g root |
590 |
- doins "etc/rootwrap.conf" |
591 |
- doins -r "etc/neutron/rootwrap.d" |
592 |
- |
593 |
- #add sudoers definitions for user neutron |
594 |
- insinto /etc/sudoers.d/ |
595 |
- insopts -m 0440 -o root -g root |
596 |
- newins "${FILESDIR}/neutron.sudoersd" neutron |
597 |
- |
598 |
- # add generated configs |
599 |
- cd "${D}/etc/neutron" || die |
600 |
- unpack "neutron-configs-${PV}.tar.gz" |
601 |
- cd "${D}/etc/neutron/plugins/ml2" || die |
602 |
- unpack "neutron-ml2-plugins-${PV}.tar.gz" |
603 |
- |
604 |
- # correcting perms |
605 |
- fowners neutron:neutron -R "/etc/neutron" |
606 |
- fperms o-rwx -R "/etc/neutron/" |
607 |
- |
608 |
- #remove superfluous stuff |
609 |
- rm -R "${D}/usr/etc/" |
610 |
-} |
611 |
- |
612 |
-python_install() { |
613 |
- distutils-r1_python_install |
614 |
- # copy migration conf file (not coppied on install via setup.py script) |
615 |
- insopts -m 0644 |
616 |
- insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" |
617 |
- doins -r "neutron/db/migration/alembic_migrations/versions" |
618 |
-} |
619 |
- |
620 |
-pkg_postinst() { |
621 |
- elog |
622 |
- elog "neutron-server's conf.d file may need updating to include additional ini files" |
623 |
- elog "We currently assume the ml2 plugin will be used but do not make assumptions" |
624 |
- elog "on if you will use openvswitch or linuxbridge (or something else)" |
625 |
- elog |
626 |
- elog "Other conf.d files may need updating too, but should be good for the default use case" |
627 |
- elog |
628 |
-} |
629 |
|
630 |
diff --git a/sys-cluster/neutron/neutron-2017.2.9999.ebuild b/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
631 |
index d0129f9df24..61871bc47a5 100644 |
632 |
--- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
633 |
+++ b/sys-cluster/neutron/neutron-2017.2.9999.ebuild |
634 |
@@ -1,4 +1,4 @@ |
635 |
-# Copyright 1999-2017 Gentoo Foundation |
636 |
+# Copyright 1999-2018 Gentoo Foundation |
637 |
# Distributed under the terms of the GNU General Public License v2 |
638 |
|
639 |
EAPI=6 |
640 |
@@ -178,30 +178,30 @@ src_prepare() { |
641 |
python_install_all() { |
642 |
distutils-r1_python_install_all |
643 |
if use server; then |
644 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-server" |
645 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
646 |
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
647 |
dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
648 |
fi |
649 |
if use dhcp; then |
650 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent" |
651 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
652 |
newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" |
653 |
fi |
654 |
if use l3; then |
655 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent" |
656 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" |
657 |
newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" |
658 |
fi |
659 |
if use metadata; then |
660 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent" |
661 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" |
662 |
newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" |
663 |
fi |
664 |
if use openvswitch; then |
665 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-openvswitch-agent" |
666 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" |
667 |
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" |
668 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup" |
669 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" |
670 |
newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" |
671 |
fi |
672 |
if use linuxbridge; then |
673 |
- newinitd "${FILESDIR}/neutron.initd-2" "neutron-linuxbridge-agent" |
674 |
+ newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" |
675 |
newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" |
676 |
fi |
677 |
diropts -m 755 -o neutron -g neutron |