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.bb13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index aa677ae..4966250 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -11,15 +11,15 @@ SRCNAME = "nova"
11 11
12FILESEXTRAPATHS_append := "${THISDIR}/${PN}" 12FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
13 13
14SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ 14SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
15 file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ 15 file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
16 file://nova-convert-path-from-relative-to-absolute.patch \
17 file://nova-fix-location-to-doc-directory.patch \
18 file://nova-fix-location-to-plugin-directory.patch \
19 file://neutron-api-set-default-binding-vnic_type.patch \ 16 file://neutron-api-set-default-binding-vnic_type.patch \
20 " 17 "
21# restore post stable/juno: 18# restore post stable/juno:
22# file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch 19# file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch
20# file://nova-convert-path-from-relative-to-absolute.patch
21# file://nova-fix-location-to-doc-directory.patch
22# file://nova-fix-location-to-plugin-directory.patch
23 23
24SRC_URI += "file://nova-all \ 24SRC_URI += "file://nova-all \
25 file://nova.init \ 25 file://nova.init \
@@ -27,8 +27,8 @@ SRC_URI += "file://nova-all \
27 file://nova.conf \ 27 file://nova.conf \
28 file://openrc \ 28 file://openrc \
29 " 29 "
30SRCREV="9c3ec16576e2f7c9d5aff6e4b620d708e6636568" 30SRCREV="b6e11261a97bf96d5f9866f277d8ecc3be7891e5"
31PV="2014.2+git${SRCPV}" 31PV="2015.1.0b2+git${SRCPV}"
32 32
33S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"
34 34
@@ -297,6 +297,7 @@ RDEPENDS_${PN} = " libvirt \
297 python-oslo.rootwrap \ 297 python-oslo.rootwrap \
298 python-oslo.concurrency \ 298 python-oslo.concurrency \
299 python-oslo.middleware \ 299 python-oslo.middleware \
300 python-oslo.context \
300 python-paste \ 301 python-paste \
301 python-pastedeploy \ 302 python-pastedeploy \
302 python-paramiko \ 303 python-paramiko \