Merge lp:~openstack-charmers/charm-helpers/0mq into lp:charm-helpers

[Liam Young]

Add 0mq support

[James Page (james-page)]

review: Approve

[Liam Young (gnuoy)]

approve

review: Approve

[lp:~openstack-charmers/charm-helpers/0mq]

320. By James Page on 2015-02-24

[james-page,r=gnuoy] Add redis support for zeromq helpers

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-01-22 06:11:15 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-02-24 11:28:04 +0000
@@ -1021,6 +1021,8 @@
                     for unit in related_units(rid):
                         ctxt['zmq_nonce'] = relation_get('nonce', unit, rid)
                         ctxt['zmq_host'] = relation_get('host', unit, rid)
+                        ctxt['zmq_redis_address'] = relation_get(
+                            'zmq_redis_address', unit, rid)
 
         return ctxt
 

=== added file 'charmhelpers/contrib/openstack/templates/zeromq'
--- charmhelpers/contrib/openstack/templates/zeromq	1970-01-01 00:00:00 +0000
+++ charmhelpers/contrib/openstack/templates/zeromq	2015-02-24 11:28:04 +0000
@@ -0,0 +1,14 @@
+{% if zmq_host -%}
+# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
+rpc_backend = zmq
+rpc_zmq_host = {{ zmq_host }}
+{% if zmq_redis_address -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis
+matchmaker_heartbeat_freq = 15
+matchmaker_heartbeat_ttl = 30
+[matchmaker_redis]
+host = {{ zmq_redis_address }}
+{% else -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
+{% endif -%}
+{% endif -%}

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-02-03 21:01:32 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-02-24 11:28:04 +0000
@@ -1940,10 +1940,11 @@
         self.is_relation_made.return_value = True
         self.relation_ids.return_value = ['zeromq-configuration:1']
         self.related_units.return_value = ['openstack-zeromq/0']
-        self.relation_get.side_effect = ['nonce-data', 'hostname']
+        self.relation_get.side_effect = ['nonce-data', 'hostname', 'redis']
         self.assertEquals(context.ZeroMQContext()(),
                           {'zmq_host': 'hostname',
-                           'zmq_nonce': 'nonce-data'})
+                           'zmq_nonce': 'nonce-data',
+                           'zmq_redis_address': 'redis'})
 
     def test_notificationdriver_context_nomsg(self):
         relations = {