diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-31 23:31:13 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-31 23:49:54 -0400 |
commit | 0cffcd09a44b2a58452a5bb13714bfc47d6546bf (patch) | |
tree | b91584b573ce42431a35a9b8f064d8be57974e1e /meta-openstack/recipes-devtools/python/python-neutron_git.bb | |
parent | e887a996155f8b9f22d6aca0e31b5fbccd82751e (diff) | |
download | meta-cloud-services-0cffcd09a44b2a58452a5bb13714bfc47d6546bf.tar.gz |
global: overrides conversion
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron_git.bb | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 315cb45..5973834 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb | |||
@@ -38,8 +38,8 @@ USER = "neutron" | |||
38 | GROUP = "neutron" | 38 | GROUP = "neutron" |
39 | 39 | ||
40 | USERADD_PACKAGES = "${PN}" | 40 | USERADD_PACKAGES = "${PN}" |
41 | GROUPADD_PARAM_${PN} = "--system ${GROUP}" | 41 | GROUPADD_PARAM:${PN} = "--system ${GROUP}" |
42 | USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}" | 42 | USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}" |
43 | 43 | ||
44 | SERVICECREATE_PACKAGES = "${SRCNAME}-setup" | 44 | SERVICECREATE_PACKAGES = "${SRCNAME}-setup" |
45 | KEYSTONE_HOST="${CONTROLLER_IP}" | 45 | KEYSTONE_HOST="${CONTROLLER_IP}" |
@@ -60,7 +60,7 @@ python () { | |||
60 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) | 60 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) |
61 | } | 61 | } |
62 | 62 | ||
63 | do_install_append() { | 63 | do_install:append() { |
64 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/ | 64 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/ |
65 | NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron | 65 | NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron |
66 | 66 | ||
@@ -214,7 +214,7 @@ do_install_append() { | |||
214 | install -m 600 ${S}/etc/neutron/rootwrap.d/* ${NEUTRON_CONF_DIR}/rootwrap.d/ | 214 | install -m 600 ${S}/etc/neutron/rootwrap.d/* ${NEUTRON_CONF_DIR}/rootwrap.d/ |
215 | } | 215 | } |
216 | 216 | ||
217 | pkg_postinst_${SRCNAME}-setup () { | 217 | pkg_postinst:${SRCNAME}-setup () { |
218 | if [ -z "$D" ]; then | 218 | if [ -z "$D" ]; then |
219 | # This is to make sure postgres is configured and running | 219 | # This is to make sure postgres is configured and running |
220 | if ! pidof postmaster > /dev/null; then | 220 | if ! pidof postmaster > /dev/null; then |
@@ -229,15 +229,15 @@ pkg_postinst_${SRCNAME}-setup () { | |||
229 | fi | 229 | fi |
230 | } | 230 | } |
231 | 231 | ||
232 | pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () { | 232 | pkg_postinst:${SRCNAME}-plugin-openvswitch-setup () { |
233 | if [ -z "$D" ]; then | 233 | if [ -z "$D" ]; then |
234 | /etc/init.d/openvswitch-switch start | 234 | /etc/init.d/openvswitch-switch start |
235 | ovs-vsctl --no-wait -- --may-exist add-br br-int | 235 | ovs-vsctl --no-wait -- --may-exist add-br br-int |
236 | fi | 236 | fi |
237 | } | 237 | } |
238 | 238 | ||
239 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 239 | ALLOW_EMPTY:${SRCNAME}-setup = "1" |
240 | ALLOW_EMPTY_${SRCNAME}-plugin-openvswitch-setup = "1" | 240 | ALLOW_EMPTY:${SRCNAME}-plugin-openvswitch-setup = "1" |
241 | 241 | ||
242 | PACKAGES += " \ | 242 | PACKAGES += " \ |
243 | ${SRCNAME}-tests \ | 243 | ${SRCNAME}-tests \ |
@@ -257,13 +257,13 @@ PACKAGES += " \ | |||
257 | ${SRCNAME}-plugin-openvswitch-setup \ | 257 | ${SRCNAME}-plugin-openvswitch-setup \ |
258 | " | 258 | " |
259 | 259 | ||
260 | FILES_${PN} = "${libdir}/*" | 260 | FILES:${PN} = "${libdir}/*" |
261 | 261 | ||
262 | FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" | 262 | FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" |
263 | RDEPENDS_${SRCNAME}-tests += " bash" | 263 | RDEPENDS:${SRCNAME}-tests += " bash" |
264 | 264 | ||
265 | 265 | ||
266 | FILES_${SRCNAME} = " \ | 266 | FILES:${SRCNAME} = " \ |
267 | ${bindir}/neutron-db-manage \ | 267 | ${bindir}/neutron-db-manage \ |
268 | ${bindir}/neutron-rootwrap \ | 268 | ${bindir}/neutron-rootwrap \ |
269 | ${bindir}/neutron-debug \ | 269 | ${bindir}/neutron-debug \ |
@@ -278,53 +278,53 @@ FILES_${SRCNAME} = " \ | |||
278 | ${localstatedir}/* \ | 278 | ${localstatedir}/* \ |
279 | " | 279 | " |
280 | 280 | ||
281 | FILES_${SRCNAME}-server = " \ | 281 | FILES:${SRCNAME}-server = " \ |
282 | ${bindir}/neutron-server \ | 282 | ${bindir}/neutron-server \ |
283 | ${sysconfdir}/neutron/plugin.ini \ | 283 | ${sysconfdir}/neutron/plugin.ini \ |
284 | " | 284 | " |
285 | 285 | ||
286 | FILES_${SRCNAME}-plugin-ml2 = " \ | 286 | FILES:${SRCNAME}-plugin-ml2 = " \ |
287 | ${sysconfdir}/${SRCNAME}/plugins/ml2/* \ | 287 | ${sysconfdir}/${SRCNAME}/plugins/ml2/* \ |
288 | " | 288 | " |
289 | 289 | ||
290 | FILES_${SRCNAME}-plugin-openvswitch = " \ | 290 | FILES:${SRCNAME}-plugin-openvswitch = " \ |
291 | ${bindir}/neutron-openvswitch-agent \ | 291 | ${bindir}/neutron-openvswitch-agent \ |
292 | ${sysconfdir}/init.d/neutron-openvswitch-agent \ | 292 | ${sysconfdir}/init.d/neutron-openvswitch-agent \ |
293 | " | 293 | " |
294 | 294 | ||
295 | FILES_${SRCNAME}-dhcp-agent = " \ | 295 | FILES:${SRCNAME}-dhcp-agent = " \ |
296 | ${bindir}/neutron-dhcp-agent \ | 296 | ${bindir}/neutron-dhcp-agent \ |
297 | ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \ | 297 | ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \ |
298 | ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \ | 298 | ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \ |
299 | ${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup \ | 299 | ${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup \ |
300 | " | 300 | " |
301 | 301 | ||
302 | FILES_${SRCNAME}-linuxbridge-agent = " \ | 302 | FILES:${SRCNAME}-linuxbridge-agent = " \ |
303 | ${bindir}/neutron-linuxbridge-agent \ | 303 | ${bindir}/neutron-linuxbridge-agent \ |
304 | ${sysconfdir}/${SRCNAME}/plugins/ml2/linuxbridge_agent.ini \ | 304 | ${sysconfdir}/${SRCNAME}/plugins/ml2/linuxbridge_agent.ini \ |
305 | " | 305 | " |
306 | 306 | ||
307 | FILES_${SRCNAME}-l3-agent = " \ | 307 | FILES:${SRCNAME}-l3-agent = " \ |
308 | ${bindir}/neutron-l3-agent \ | 308 | ${bindir}/neutron-l3-agent \ |
309 | ${sysconfdir}/${SRCNAME}/l3_agent.ini \ | 309 | ${sysconfdir}/${SRCNAME}/l3_agent.ini \ |
310 | " | 310 | " |
311 | 311 | ||
312 | FILES_${SRCNAME}-metadata-agent = " \ | 312 | FILES:${SRCNAME}-metadata-agent = " \ |
313 | ${bindir}/neutron-metadata-agent \ | 313 | ${bindir}/neutron-metadata-agent \ |
314 | ${bindir}/neutron-ns-metadata-proxy \ | 314 | ${bindir}/neutron-ns-metadata-proxy \ |
315 | ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ | 315 | ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ |
316 | " | 316 | " |
317 | 317 | ||
318 | FILES_${SRCNAME}-metering-agent = " \ | 318 | FILES:${SRCNAME}-metering-agent = " \ |
319 | ${bindir}/neutron-metering-agent \ | 319 | ${bindir}/neutron-metering-agent \ |
320 | ${sysconfdir}/${SRCNAME}/metering_agent.ini \ | 320 | ${sysconfdir}/${SRCNAME}/metering_agent.ini \ |
321 | " | 321 | " |
322 | 322 | ||
323 | FILES_${SRCNAME}-extra-agents = "${bindir}/*" | 323 | FILES:${SRCNAME}-extra-agents = "${bindir}/*" |
324 | 324 | ||
325 | FILES_${SRCNAME}-doc = "${datadir}/*" | 325 | FILES:${SRCNAME}-doc = "${datadir}/*" |
326 | 326 | ||
327 | FILES_${SRCNAME}-setup = " \ | 327 | FILES:${SRCNAME}-setup = " \ |
328 | ${sysconfdir}/neutron/neutron-init \ | 328 | ${sysconfdir}/neutron/neutron-init \ |
329 | " | 329 | " |
330 | 330 | ||
@@ -338,7 +338,7 @@ DEPENDS += " \ | |||
338 | python-pbr-native \ | 338 | python-pbr-native \ |
339 | " | 339 | " |
340 | 340 | ||
341 | RDEPENDS_${PN} += " \ | 341 | RDEPENDS:${PN} += " \ |
342 | python-pbr \ | 342 | python-pbr \ |
343 | python-paste \ | 343 | python-paste \ |
344 | python-pastedeploy \ | 344 | python-pastedeploy \ |
@@ -389,20 +389,20 @@ RDEPENDS_${PN} += " \ | |||
389 | python-os-xenapi \ | 389 | python-os-xenapi \ |
390 | " | 390 | " |
391 | 391 | ||
392 | RDEPENDS_${SRCNAME} = "${PN} \ | 392 | RDEPENDS:${SRCNAME} = "${PN} \ |
393 | postgresql postgresql-client python-psycopg2" | 393 | postgresql postgresql-client python-psycopg2" |
394 | 394 | ||
395 | RDEPENDS_${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent" | 395 | RDEPENDS:${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent" |
396 | RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils" | 396 | RDEPENDS:${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils" |
397 | RDEPENDS_${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch " | 397 | RDEPENDS:${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch " |
398 | RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config" | 398 | RDEPENDS:${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config" |
399 | RDEPENDS_${SRCNAME}-linuxbridge-agent = "${SRCNAME}" | 399 | RDEPENDS:${SRCNAME}-linuxbridge-agent = "${SRCNAME}" |
400 | RDEPENDS_${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils" | 400 | RDEPENDS:${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils" |
401 | RDEPENDS_${SRCNAME}-metadata-agent = "${SRCNAME}" | 401 | RDEPENDS:${SRCNAME}-metadata-agent = "${SRCNAME}" |
402 | RDEPENDS_${SRCNAME}-plugin-ml2 = "${SRCNAME}" | 402 | RDEPENDS:${SRCNAME}-plugin-ml2 = "${SRCNAME}" |
403 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo bash" | 403 | RDEPENDS:${SRCNAME}-setup = "postgresql sudo bash" |
404 | 404 | ||
405 | RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" | 405 | RRECOMMENDS:${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" |
406 | 406 | ||
407 | #INITSCRIPT_PACKAGES = "${SRCNAME}-plugin-openvswitch ${SRCNAME}-l3-agent" | 407 | #INITSCRIPT_PACKAGES = "${SRCNAME}-plugin-openvswitch ${SRCNAME}-l3-agent" |
408 | #INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" | 408 | #INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" |
@@ -417,17 +417,17 @@ SYSTEMD_PACKAGES = " \ | |||
417 | ${SRCNAME}-linuxbridge-agent \ | 417 | ${SRCNAME}-linuxbridge-agent \ |
418 | ${SRCNAME}-metadata-agent \ | 418 | ${SRCNAME}-metadata-agent \ |
419 | " | 419 | " |
420 | SYSTEMD_SERVICE_${SRCNAME}-server = "neutron-server.service" | 420 | SYSTEMD_SERVICE:${SRCNAME}-server = "neutron-server.service" |
421 | SYSTEMD_SERVICE_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service" | 421 | SYSTEMD_SERVICE:${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service" |
422 | SYSTEMD_SERVICE_${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service" | 422 | SYSTEMD_SERVICE:${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service" |
423 | SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" | 423 | SYSTEMD_SERVICE:${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" |
424 | SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service" | 424 | SYSTEMD_SERVICE:${SRCNAME}-setup = "neutron-init.service" |
425 | 425 | ||
426 | # Disable unconfigured services | 426 | # Disable unconfigured services |
427 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-server = "disable" | 427 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-server = "disable" |
428 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-dhcp-agent = "disable" | 428 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-dhcp-agent = "disable" |
429 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-linuxbridge-agent = "disable" | 429 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable" |
430 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-metadata-agent = "disable" | 430 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable" |
431 | 431 | ||
432 | 432 | ||
433 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 433 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |