diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 8c643bd..77e7b82 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = " \ | |||
11 | 11 | ||
12 | SRCNAME = "nova" | 12 | SRCNAME = "nova" |
13 | 13 | ||
14 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" | 14 | FILESEXTRAPATHS:append := "${THISDIR}/${PN}" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ | 16 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ |
17 | file://neutron-api-set-default-binding-vnic_type.patch \ | 17 | file://neutron-api-set-default-binding-vnic_type.patch \ |
@@ -46,8 +46,8 @@ USER = "nova" | |||
46 | GROUP = "nova" | 46 | GROUP = "nova" |
47 | 47 | ||
48 | USERADD_PACKAGES = "${PN}" | 48 | USERADD_PACKAGES = "${PN}" |
49 | GROUPADD_PARAM_${PN} = "--system ${GROUP}" | 49 | GROUPADD_PARAM:${PN} = "--system ${GROUP}" |
50 | USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}" | 50 | USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}" |
51 | 51 | ||
52 | # Need to create the user? | 52 | # Need to create the user? |
53 | PLACEMENT_USER = "placement" | 53 | PLACEMENT_USER = "placement" |
@@ -82,7 +82,7 @@ python () { | |||
82 | d.setVarFlags("SERVICECREATE_PARAM_%s-ec2" % d.getVar('SRCNAME',True), flags) | 82 | d.setVarFlags("SERVICECREATE_PARAM_%s-ec2" % d.getVar('SRCNAME',True), flags) |
83 | } | 83 | } |
84 | 84 | ||
85 | do_install_append() { | 85 | do_install:append() { |
86 | if [ ! -f "${WORKDIR}/nova.conf" ]; then | 86 | if [ ! -f "${WORKDIR}/nova.conf" ]; then |
87 | return | 87 | return |
88 | fi | 88 | fi |
@@ -227,37 +227,37 @@ PACKAGECONFIG ?= "bash-completion" | |||
227 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion" | 227 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion" |
228 | 228 | ||
229 | PACKAGES =+ "${BPN}-bash-completion" | 229 | PACKAGES =+ "${BPN}-bash-completion" |
230 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | 230 | FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" |
231 | 231 | ||
232 | 232 | ||
233 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 233 | ALLOW_EMPTY:${SRCNAME}-setup = "1" |
234 | ALLOW_EMPTY_${SRCNAME}-ec2 = "1" | 234 | ALLOW_EMPTY:${SRCNAME}-ec2 = "1" |
235 | ALLOW_EMPTY_${SRCNAME}-api = "1" | 235 | ALLOW_EMPTY:${SRCNAME}-api = "1" |
236 | ALLOW_EMPTY_${SRCNAME}-compute = "1" | 236 | ALLOW_EMPTY:${SRCNAME}-compute = "1" |
237 | ALLOW_EMPTY_${SRCNAME}-controller = "1" | 237 | ALLOW_EMPTY:${SRCNAME}-controller = "1" |
238 | ALLOW_EMPTY_${SRCNAME}-console = "1" | 238 | ALLOW_EMPTY:${SRCNAME}-console = "1" |
239 | ALLOW_EMPTY_${SRCNAME}-conductor = "1" | 239 | ALLOW_EMPTY:${SRCNAME}-conductor = "1" |
240 | ALLOW_EMPTY_${SRCNAME}-network = "1" | 240 | ALLOW_EMPTY:${SRCNAME}-network = "1" |
241 | ALLOW_EMPTY_${SRCNAME}-novncproxy = "1" | 241 | ALLOW_EMPTY:${SRCNAME}-novncproxy = "1" |
242 | ALLOW_EMPTY_${SRCNAME}-scheduler = "1" | 242 | ALLOW_EMPTY:${SRCNAME}-scheduler = "1" |
243 | ALLOW_EMPTY_${SRCNAME}-spicehtml5proxy = "1" | 243 | ALLOW_EMPTY:${SRCNAME}-spicehtml5proxy = "1" |
244 | 244 | ||
245 | 245 | ||
246 | 246 | ||
247 | FILES_${PN} = "${libdir}/*" | 247 | FILES:${PN} = "${libdir}/*" |
248 | 248 | ||
249 | # MAA FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" | 249 | # MAA FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" |
250 | FILES_${SRCNAME}-tests = "" | 250 | FILES:${SRCNAME}-tests = "" |
251 | 251 | ||
252 | FILES_${SRCNAME}-common = "${bindir}/nova-manage \ | 252 | FILES:${SRCNAME}-common = "${bindir}/nova-manage \ |
253 | ${bindir}/nova-rootwrap \ | 253 | ${bindir}/nova-rootwrap \ |
254 | ${sysconfdir}/${SRCNAME}/* \ | 254 | ${sysconfdir}/${SRCNAME}/* \ |
255 | ${sysconfdir}/sudoers.d" | 255 | ${sysconfdir}/sudoers.d" |
256 | 256 | ||
257 | FILES_${SRCNAME}-compute = "${bindir}/nova-compute \ | 257 | FILES:${SRCNAME}-compute = "${bindir}/nova-compute \ |
258 | ${sysconfdir}/init.d/nova-compute" | 258 | ${sysconfdir}/init.d/nova-compute" |
259 | 259 | ||
260 | FILES_${SRCNAME}-controller = "${bindir}/* \ | 260 | FILES:${SRCNAME}-controller = "${bindir}/* \ |
261 | ${sysconfdir}/init.d/nova-all " | 261 | ${sysconfdir}/init.d/nova-all " |
262 | 262 | ||
263 | DEPENDS += " \ | 263 | DEPENDS += " \ |
@@ -270,7 +270,7 @@ DEPENDS += " \ | |||
270 | python-pbr-native \ | 270 | python-pbr-native \ |
271 | " | 271 | " |
272 | 272 | ||
273 | RDEPENDS_${PN} += " \ | 273 | RDEPENDS:${PN} += " \ |
274 | libvirt \ | 274 | libvirt \ |
275 | python-pbr \ | 275 | python-pbr \ |
276 | python-sqlalchemy \ | 276 | python-sqlalchemy \ |
@@ -333,10 +333,10 @@ RDEPENDS_${PN} += " \ | |||
333 | python-pypowervm \ | 333 | python-pypowervm \ |
334 | " | 334 | " |
335 | 335 | ||
336 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ | 336 | RDEPENDS:${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ |
337 | iptables curl dnsmasq sudo procps" | 337 | iptables curl dnsmasq sudo procps" |
338 | 338 | ||
339 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ | 339 | RDEPENDS:${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ |
340 | ${SRCNAME}-ec2 \ | 340 | ${SRCNAME}-ec2 \ |
341 | ${SRCNAME}-console \ | 341 | ${SRCNAME}-console \ |
342 | ${SRCNAME}-novncproxy \ | 342 | ${SRCNAME}-novncproxy \ |
@@ -347,12 +347,12 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ | |||
347 | ${SRCNAME}-api \ | 347 | ${SRCNAME}-api \ |
348 | postgresql postgresql-client python-psycopg2" | 348 | postgresql postgresql-client python-psycopg2" |
349 | 349 | ||
350 | RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ | 350 | RDEPENDS:${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ |
351 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" | 351 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" |
352 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" | 352 | RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" |
353 | RDEPENDS_${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common" | 353 | RDEPENDS:${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common" |
354 | 354 | ||
355 | RDEPENDS_${SRCNAME}-tests = " \ | 355 | RDEPENDS:${SRCNAME}-tests = " \ |
356 | python-coverage \ | 356 | python-coverage \ |
357 | bash \ | 357 | bash \ |
358 | " | 358 | " |
@@ -370,22 +370,22 @@ SYSTEMD_PACKAGES = " \ | |||
370 | ${SRCNAME}-api \ | 370 | ${SRCNAME}-api \ |
371 | " | 371 | " |
372 | 372 | ||
373 | SYSTEMD_SERVICE_${SRCNAME}-setup = "nova-init.service" | 373 | SYSTEMD_SERVICE:${SRCNAME}-setup = "nova-init.service" |
374 | SYSTEMD_SERVICE_${SRCNAME}-compute = "nova-compute.service" | 374 | SYSTEMD_SERVICE:${SRCNAME}-compute = "nova-compute.service" |
375 | SYSTEMD_SERVICE_${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service" | 375 | SYSTEMD_SERVICE:${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service" |
376 | SYSTEMD_SERVICE_${SRCNAME}-novncproxy = "nova-novncproxy.service" | 376 | SYSTEMD_SERVICE:${SRCNAME}-novncproxy = "nova-novncproxy.service" |
377 | SYSTEMD_SERVICE_${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service" | 377 | SYSTEMD_SERVICE:${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service" |
378 | SYSTEMD_SERVICE_${SRCNAME}-network = "nova-network.service" | 378 | SYSTEMD_SERVICE:${SRCNAME}-network = "nova-network.service" |
379 | SYSTEMD_SERVICE_${SRCNAME}-scheduler = "nova-scheduler.service" | 379 | SYSTEMD_SERVICE:${SRCNAME}-scheduler = "nova-scheduler.service" |
380 | SYSTEMD_SERVICE_${SRCNAME}-conductor = "nova-conductor.service" | 380 | SYSTEMD_SERVICE:${SRCNAME}-conductor = "nova-conductor.service" |
381 | SYSTEMD_SERVICE_${SRCNAME}-api = "nova-api.service" | 381 | SYSTEMD_SERVICE:${SRCNAME}-api = "nova-api.service" |
382 | 382 | ||
383 | # Disable services on first boot to avoid having them run when not configured | 383 | # Disable services on first boot to avoid having them run when not configured |
384 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable" | 384 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable" |
385 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-consoleauth = "disable" | 385 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-consoleauth = "disable" |
386 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable" | 386 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable" |
387 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-conductor = "disable" | 387 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-conductor = "disable" |
388 | SYSTEMD_AUTO_ENABLE_${SRCNAME}-novncproxy = "disable" | 388 | SYSTEMD_AUTO_ENABLE:${SRCNAME}-novncproxy = "disable" |
389 | 389 | ||
390 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" | 390 | MONITOR_SERVICE_PACKAGES = "${SRCNAME}" |
391 | MONITOR_SERVICE_${SRCNAME} = "nova-api nova-conductor nova-console nova-scheduler" | 391 | MONITOR_SERVICE_${SRCNAME} = "nova-api nova-conductor nova-console nova-scheduler" |