From 76417f9cc6be3a1d9173a6305ad351a1742b345b Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Sun, 19 Jan 2014 00:11:26 -0500
Subject: ceilometer: update to stable/havana latest

Updating the ceilometer component to the latest havana stable updates.
Of note in the update is the removel of the old global statistics table
for ceilometer.

To properly display metering statistics after this update the keystone
credentials need to be udpated in keystone (add ceilometer with an
admin role) and ceilometer to use the proper username/password to
authenticate.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-ceilometer/ceilometer.conf  | 10 +++++-----
 .../recipes-devtools/python/python-ceilometerclient_git.bb     |  2 +-
 .../recipes-devtools/python/python-keystone/identity.sh        |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
index 457199d..abeb65c 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
@@ -718,14 +718,14 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0
 
 # Host providing the admin Identity API endpoint (string
 # value)
-#auth_host=127.0.0.1
+auth_host=%CONTROLLER_IP%
 
 # Port of the admin Identity API endpoint (integer value)
 #auth_port=35357
 
 # Protocol of the admin Identity API endpoint(http or https)
 # (string value)
-#auth_protocol=https
+auth_protocol=http
 
 # Complete public Identity API endpoint (string value)
 #auth_uri=<None>
@@ -759,14 +759,14 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0
 #admin_token=<None>
 
 # Keystone account username (string value)
-#admin_user=<None>
+admin_user=ceilometer
 
 # Keystone account password (string value)
-#admin_password=<None>
+admin_password=%ADMIN_PASSWORD%
 
 # Keystone service account tenant name to validate user tokens
 # (string value)
-#admin_tenant_name=admin
+admin_tenant_name=%SERVICE_TENANT_NAME%
 
 # Env key for the swift cache (string value)
 #cache=<None>
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
index c0d3df4..7362733 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
@@ -17,7 +17,7 @@ PR = "r0"
 SRC_URI = "git://github.com/openstack/python-ceilometerclient.git;branch=master"
 
 PV="1.0.6+git${SRCPV}"
-SRCREV="067b76d9a821c3acb60d93787396d25b729a7421"
+SRCREV="4c42f5052678539648a1051a526b82ab95269a2b"
 S = "${WORKDIR}/git"
 
 inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
index edf29ef..bf5aca7 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
+++ b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
@@ -143,6 +143,7 @@ keystone user-role-list --user-id $DEMO_USER --tenant-id $DEMO_TENANT &> /dev/nu
 keystone user-role-add --tenant-id $DEMO_TENANT --user-id $DEMO_USER --role-id $MEMBER_ROLE
 
 keystone user-role-list --user-id $CEILOMETER_USER --tenant_id $SERVICE_TENANT &> /dev/null
+keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CEILOMETER_USER --role-id $ADMIN_ROLE
 keystone user-role-add --tenant_id $SERVICE_TENANT --user_id $CEILOMETER_USER --role-id $RESELLER_ADMIN_ROLE
 
 keystone user-role-add --tenant_id $SERVICE_TENANT --user-id $HEAT_USER --role-id $ADMIN_ROLE
-- 
cgit v1.2.3-54-g00ecf