aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-20 08:16:22 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-05-20 08:16:22 -0400
commitc5feedcbab087538da2dea0cf0f32db5b1efa5df (patch)
tree3a0d11601973b5d04380931fcd6e3f17561d1b6e
parentab3432d7ff4ea9b7fd3dd4e04376d2b67e467eb6 (diff)
parent71b7ba7724a8d4a59a46de1828894176ff985020 (diff)
downloadmeta-cloud-services-c5feedcbab087538da2dea0cf0f32db5b1efa5df.tar.gz
meta-cloud-services-c5feedcbab087538da2dea0cf0f32db5b1efa5df.tar.bz2
meta-cloud-services-c5feedcbab087538da2dea0cf0f32db5b1efa5df.zip
Merge branch 'master' into kilo
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb1
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb3
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 0063efc..383163d 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} += " \
python-requests \
python-simplejson \
python-oslo.config \
+ python-oslo.serialization \
python-pbr \
"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 4e96341..423b0c3 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -274,6 +274,7 @@ RDEPENDS_${PN} = " libvirt \
python-keystonemiddleware \
python-modules \
python-misc \
+ python-amqp \
python-amqplib \
python-anyjson \
python-babel \
@@ -297,9 +298,11 @@ RDEPENDS_${PN} = " libvirt \
python-oslo.concurrency \
python-oslo.middleware \
python-oslo.context \
+ python-oslo.log \
python-paste \
python-pastedeploy \
python-paramiko \
+ python-psutil \
python-pyasn1 \
python-setuptools-git \
python-simplejson \