Merge lp:~yolanda.robla/charms/precise/ceilometer/trunk into lp:~openstack-charmers-archive/charms/precise/ceilometer/trunk

[Yolanda Robla]

Need ResellerAdmin role for grabbing swift Metrics

=== modified file 'hooks/ceilometer_utils.py'
--- hooks/ceilometer_utils.py	2013-03-31 11:19:54 +0000
+++ hooks/ceilometer_utils.py	2013-04-05 15:18:36 +0000
@@ -19,6 +19,7 @@
 CEILOMETER_AGENT_PACKAGES = ['python-ceilometer', 'ceilometer-common',
     'ceilometer-agent-compute']
 CEILOMETER_PORT = 8777
+CEILOMETER_ROLE = "ResellerAdmin"
 
 NOVA_CONF = "/etc/nova/nova.conf"
 NOVA_SETTINGS = [

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-03-31 11:19:54 +0000
+++ hooks/hooks.py	2013-04-05 15:18:36 +0000
@@ -38,7 +38,9 @@
     region = utils.config_get("region")
 
     utils.relation_set(service=ceilometer_utils.CEILOMETER_SERVICE,
-        public_url=url, admin_url=url, internal_url=url, region=region)
+        public_url=url, admin_url=url, internal_url=url,
+        requested_roles=ceilometer_utils.CEILOMETER_ROLE,
+        region=region)
 
 
 def keystone_changed():

=== modified file 'revision'
--- revision	2013-03-22 12:38:19 +0000
+++ revision	2013-04-05 15:18:36 +0000
@@ -1,1 +1,1 @@
-41
+42