3 files changed, 49 insertions, 10 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-Fix-for-get_statistics-with-postgresql.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-Fix-for-get_statistics-with-postgresql.patch
new file mode 100644
index 0000000..2a3ae9d
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-Fix-for-get_statistics-with-postgresql.patch
@@ -0,0 +1,33 @@
+From a784cd8f552e1f8ead86230f96e5b9ac8217efea Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Wed, 29 Jan 2014 18:05:46 -0500
+Subject: [PATCH] sqlalchemy: Fix for get_statistics with postgresql
+
+Based on: https://review.openstack.org/#/c/59214/
+
+  Add group by counter_unit in statistics queryI
+  Fixes: bug #1256318
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ ceilometer/storage/impl_sqlalchemy.py |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
+index 8a3deba3a4ea..92d3a5901f5a 100644
+--- a/ceilometer/storage/impl_sqlalchemy.py
++++ b/ceilometer/storage/impl_sqlalchemy.py
+@@ -574,7 +574,9 @@ class Connection(base.Connection):
+             group_attributes = [getattr(models.Meter, g) for g in groupby]
+             select.extend(group_attributes)
+ 
+-        query = session.query(*select)
++        #Group by counter_unit for postgresql queries
++        #In mysql this doesn't change anything because one meter has one unit
++        query = session.query(*select).group_by(models.Meter.counter_unit)
+ 
+         if groupby:
+             query = query.group_by(*group_attributes)
+-- 
+1.7.10.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
index abeb65c..4632f40 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
@@ -65,7 +65,7 @@
 
 # Inspector to use for inspecting the hypervisor layer (string
 # value)
-#hypervisor_inspector=libvirt
+hypervisor_inspector=libvirt
 
 
 #
@@ -86,7 +86,7 @@ libvirt_type=kvm
 #
 
 # Exchange name for Glance notifications (string value)
-#glance_control_exchange=glance
+glance_control_exchange=glance
 
 
 #
@@ -94,7 +94,7 @@ libvirt_type=kvm
 #
 
 # Exchange name for Neutron notifications (string value)
-#neutron_control_exchange=neutron
+neutron_control_exchange=neutron
 
 
 #
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 \