Signed-off-by: Mark Asselstine <[email protected]>
---
.../python/python-ceilometer_git.bb | 30 ++++++++++++++++++----
.../python/python-ceilometerclient_git.bb | 18 ++++++++-----
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 3860ca5..2825e60 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-PR = "r0"
SRCNAME = "ceilometer"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
file://ceilometer.conf \
file://ceilometer.init \
file://fix_ceilometer_memory_leak.patch \
@@ -16,8 +15,8 @@ SRC_URI =
"git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
# file://ceilometer-builtin-tests-config-location.patch
-SRCREV = "b0447ed8e7bee371bf7095c86e47d717abe89edc"
-PV = "2015.1.0+git${SRCPV}"
+SRCREV = "026a5d475e1958bf761e41c2bb426b09e0f3d270"
+PV = "5.0.0+git${SRCPV}"
S = "${WORKDIR}/git"
CEILOMETER_SECRET ?= "12121212"
@@ -202,7 +201,7 @@ RDEPENDS_${PN} += " \
python-paste \
python-sqlalchemy-migrate \
python-stevedore \
- python-suds \
+ python-suds-jurko \
python-paramiko \
python-babel \
python-iso8601 \
@@ -237,6 +236,27 @@ RDEPENDS_${PN} += " \
python-croniter \
python-ipaddr \
python-pysnmp \
+ python-retrying \
+ python-jsonpath-rw-ext \
+ python-jsonschema \
+ python-kafka \
+ python-keystonemiddleware \
+ python-oslo.context \
+ python-oslo.db \
+ python-oslo.concurrency \
+ python-oslo.i18n \
+ python-oslo.log \
+ python-oslo.policy \
+ python-oslo.reports \
+ python-oslo.service \
+ python-oslo.messaging \
+ python-oslo.middleware \
+ python-oslo.utils \
+ python-neutronclient \
+ python-novaclient \
+ python-requests \
+ python-six \
+ python-tooz \
"
RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common
${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator
${SRCNAME}-agent-notification ${SRCNAME}-reseller \
diff --git
a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
index 35760a9..a830e51 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
@@ -9,27 +9,33 @@ DEPENDS += " \
python-pbr \
"
-RDEPENDS_${PN} +="python-cliff \
+RDEPENDS_${PN} +=" \
+ python-cliff \
python-httplib2 \
python-iso8601 \
python-prettytable \
python-pyparsing \
python-simplejson \
python-pbr \
+ python-oslo.i18n \
+ python-oslo.serialization \
+ python-oslo.utils \
+ python-keystoneclient \
+ python-requests \
+ python-six \
+ python-stevedore \
"
-PR = "r0"
-
SRC_URI = "\
git://github.com/openstack/python-ceilometerclient.git;branch=master \
file://fix_ceilometerclient_memory_leak.patch \
"
-PV = "1.0.13+git${SRCPV}"
-SRCREV = "f8765ce532a45391c5366be8fa0f583f96a30d22"
+PV = "1.5.0+git${SRCPV}"
+SRCREV = "daed7e59c383f1ca74d75160cbc99fbd89675648"
S = "${WORKDIR}/git"
-inherit setuptools
+inherit setuptools rmargparse
PACKAGECONFIG ?= "bash-completion"
--
2.1.4
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization
