From 52630db08636fb2ceb985ee4651e7d5b9032948c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 30 Jan 2014 16:50:10 -0500 Subject: ceilometer: uprev to 2014.1.x release The havana ceilometer postgres (sqlalchemy) support has significant issues. Rather that perform signficicant backports, we'll uprev and pick up the latest development stream, that addresses many issues out of the box. Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-ceilometer_git.bb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 41fae5e..cf0d196 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -7,20 +7,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "ceilometer" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://ceilometer.conf \ file://ceilometer.init \ - file://0001-Fix-for-get_resources-with-postgresql.patch \ - file://0002-enable-sql-metadata-query.patch \ - file://sqlalchemy-fix-ceilometer-resource-query.patch \ + file://0001-sqlalchemy-Fix-for-get_statistics-with-postgresql.patch \ " -SRCREV="ef71dc6a11ab624e756bfb61ec974e9f6096bc30" -PV="2013.2.2+git${SRCPV}" +SRCREV="a4c7411ac903984c7e7524469f89a417cf9cf97e" +PV="2014.1.b2+git${SRCPV}" S = "${WORKDIR}/git" CEILOMETER_SECRET ?= "12121212" +do_configure_append() { + # We are using postgresql support, hence this requirement is not valid + # removing it, to avoid on-target runtime issues + sed -e "s:MySQL-python::g" -i ${S}/requirements.txt +} + do_install_append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} CEILOMETER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -128,7 +132,9 @@ FILES_${SRCNAME}-controller = "${bindir}/* \ " RDEPENDS_${PN} += " \ - python-sqlalchemy \ + python-ply \ + python-jsonpath-rw \ + python-sqlalchemy \ python-amqplib \ python-anyjson \ python-eventlet \ -- cgit v1.2.3-54-g00ecf