Merge lp:~openstack-charmers/charms/precise/nova-cloud-controller/ceilometer-support into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[James Page]

Add support for use with ceilometer

Needs to be merged alongside merge proposal for quantum-gateway and nova-compute charms due to vhost change in messaging.

=== modified file 'config.yaml'
--- config.yaml	2013-09-30 20:46:50 +0000
+++ config.yaml	2013-11-06 00:55:57 +0000
@@ -19,7 +19,7 @@
     type: string
     description: Username used to access rabbitmq queue
   rabbit-vhost:
-    default: nova
+    default: openstack
     type: string
     decsription: Rabbitmq vhost
   database-user:

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2013-10-23 16:55:26 +0000
+++ hooks/nova_cc_hooks.py	2013-11-06 00:55:57 +0000
@@ -103,8 +103,9 @@
 
 
 @hooks.hook('amqp-relation-joined')
-def amqp_joined():
-    relation_set(username=config('rabbit-user'), vhost=config('rabbit-vhost'))
+def amqp_joined(relation_id=None):
+    relation_set(relation_id=relation_id,
+                 username=config('rabbit-user'), vhost=config('rabbit-vhost'))
 
 
 @hooks.hook('amqp-relation-changed')
@@ -396,6 +397,12 @@
         identity_joined(rid=rid)
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    for r_id in relation_ids('amqp'):
+        amqp_joined(relation_id=r_id)
+
+
 def main():
     try:
         hooks.execute(sys.argv)