Merge lp:~openstack-charmers/charms/precise/cinder/ceilometer-support into lp:charms/raring/cinder

[James Page]

Updates to support use of OpenStack with Ceilometer.

Ceilometer requires use of a common RabbitMQ vhost for all services so it can subscribed to notifications from other services about events happening in OpenStack.

This change switches the default vhost to cinder to 'openstack' and re-executes the amqp_joined hook on upgrade to refresh the access in rabbitmq-server

[Marco Ceppi (marcoceppi)]

LGTM +1, passes tests.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-10-17 21:48:08 +0000
+++ config.yaml	2013-10-23 00:51:05 +0000
@@ -61,7 +61,7 @@
         type: string
         description: Username to request access on rabbitmq-server.
     rabbit-vhost:
-        default: cinder
+        default: openstack
         type: string
         description: RabbitMQ virtual host to request access on rabbitmq-server.
     api-listening-port:
 
=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2013-10-19 16:58:37 +0000
+++ hooks/cinder_hooks.py	2013-10-23 00:51:05 +0000
@@ -108,9 +108,10 @@
 
 
 @hooks.hook('amqp-relation-joined')
-def amqp_joined():
+def amqp_joined(relation_id=None):
     conf = config()
-    relation_set(username=conf['rabbit-user'], vhost=conf['rabbit-vhost'])
+    relation_set(relation_id=relation_id,
+                 username=conf['rabbit-user'], vhost=conf['rabbit-vhost'])
 
 
 @hooks.hook('amqp-relation-changed')
@@ -265,6 +266,12 @@
         identity_joined(rid=rid)
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    for rel_id in relation_ids('amqp'):
+        amqp_joined(relation_id=rel_id)
+
+
 if __name__ == '__main__':
     try:
         hooks.execute(sys.argv)
 
=== modified file 'templates/cinder.conf'
--- templates/cinder.conf	2013-10-17 21:48:08 +0000
+++ templates/cinder.conf	2013-10-23 00:51:05 +0000
@@ -18,6 +18,8 @@
 sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
 {% endif -%}
 {% if rabbitmq_host -%}
+notification_driver = cinder.openstack.common.notifier.rabbit_notifier
+control_exchange = cinder
 rabbit_host = {{ rabbitmq_host }}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_password = {{ rabbitmq_password }}
 
=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2013-10-20 18:31:12 +0000
+++ unit_tests/test_cinder_hooks.py	2013-10-23 00:51:05 +0000
@@ -126,6 +126,18 @@
         super(TestChangedHooks, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get_all
 
+    @patch.object(hooks, 'amqp_joined')
+    def test_upgrade_charm_no_amqp(self, _joined):
+        self.relation_ids.return_value = []
+        hooks.hooks.execute(['hooks/upgrade-charm'])
+        _joined.assert_not_called()
+
+    @patch.object(hooks, 'amqp_joined')
+    def test_upgrade_charm_with_amqp(self, _joined):
+        self.relation_ids.return_value = ['amqp:1']
+        hooks.hooks.execute(['hooks/upgrade-charm'])
+        _joined.assert_called_with(relation_id='amqp:1')
+
     @patch.object(hooks, 'configure_https')
     def test_config_changed(self, conf_https):
         '''It writes out all config'''
@@ -234,7 +246,17 @@
     def test_amqp_joined(self):
         '''It properly requests access to an amqp service'''
         hooks.hooks.execute(['hooks/amqp-relation-joined'])
-        self.relation_set.assert_called_with(username='cinder', vhost='cinder')
+        self.relation_set.assert_called_with(username='cinder',
+                                             vhost='openstack',
+                                             relation_id=None)
+
+    def test_amqp_joined_passes_relation_id(self):
+        ''' Ensures relation_id correct passed to relation_set for out of
+            hook execution '''
+        hooks.amqp_joined(relation_id='amqp:1')
+        self.relation_set.assert_called_with(username='cinder',
+                                             vhost='openstack',
+                                             relation_id='amqp:1')
 
     def test_identity_service_joined(self):
         '''It properly requests unclustered endpoint via identity-service'''