summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb17
1 files changed, 12 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 0bc5d03..fd50173 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -10,8 +10,7 @@ SRCNAME = "nova"
10 10
11FILESEXTRAPATHS_append := "${THISDIR}/${PN}" 11FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
12 12
13SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \ 13SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
14 file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
15 file://neutron-api-set-default-binding-vnic_type.patch \ 14 file://neutron-api-set-default-binding-vnic_type.patch \
16 " 15 "
17# restore post stable/juno: 16# restore post stable/juno:
@@ -26,8 +25,8 @@ SRC_URI += "file://nova-all \
26 file://nova.conf \ 25 file://nova.conf \
27 file://openrc \ 26 file://openrc \
28 " 27 "
29SRCREV = "8397b6464af520903f546ce4c6d51a2eb5b4c8a8" 28SRCREV = "6df6ad3ff32f2b1fe2978df1032002548ad8eb66"
30PV = "2015.1.0+git${SRCPV}" 29PV = "12.0.0+git${SRCPV}"
31 30
32S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"
33 32
@@ -312,7 +311,7 @@ RDEPENDS_${PN} = " libvirt \
312 python-sqlalchemy \ 311 python-sqlalchemy \
313 python-sqlalchemy-migrate \ 312 python-sqlalchemy-migrate \
314 python-stevedore \ 313 python-stevedore \
315 python-suds \ 314 python-suds-jurko \
316 python-neutronclient \ 315 python-neutronclient \
317 python-routes \ 316 python-routes \
318 python-webob \ 317 python-webob \
@@ -325,6 +324,14 @@ RDEPENDS_${PN} = " libvirt \
325 python-sqlparse \ 324 python-sqlparse \
326 python-netifaces \ 325 python-netifaces \
327 python-retrying \ 326 python-retrying \
327 python-debtcollector \
328 python-ecdsa \
329 python-wrapt \
330 python-oslo.versionedobjects \
331 python-oslo.reports \
332 python-monotonic \
333 python-oslo.service \
334 python-os-brick \
328 " 335 "
329 336
330RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ 337RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \