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

Proposed by James Page
Status: Merged
Merged at revision: 346
Proposed branch: lp:~openstack-charmers/charm-helpers/0mq
Merge into: lp:charm-helpers
Diff against target: 37 lines (+14/-14)
2 files modified
charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
To merge this branch: bzr merge lp:~openstack-charmers/charm-helpers/0mq
Reviewer Review Type Date Requested Status
Liam Young Approve
Review via email: mp+254590@code.launchpad.net

Description of the change

Misc fixes for 0mq templates for OpenStack Kilo.

To post a comment you must log in.
337. By James Page

Rename zeromq snippet

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'charmhelpers/contrib/openstack/templates/section-zeromq'
2--- charmhelpers/contrib/openstack/templates/section-zeromq 1970-01-01 00:00:00 +0000
3+++ charmhelpers/contrib/openstack/templates/section-zeromq 2015-03-30 15:20:18 +0000
4@@ -0,0 +1,14 @@
5+{% if zmq_host -%}
6+# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
7+rpc_backend = zmq
8+rpc_zmq_host = {{ zmq_host }}
9+{% if zmq_redis_address -%}
10+rpc_zmq_matchmaker = redis
11+matchmaker_heartbeat_freq = 15
12+matchmaker_heartbeat_ttl = 30
13+[matchmaker_redis]
14+host = {{ zmq_redis_address }}
15+{% else -%}
16+rpc_zmq_matchmaker = ring
17+{% endif -%}
18+{% endif -%}
19
20=== removed file 'charmhelpers/contrib/openstack/templates/zeromq'
21--- charmhelpers/contrib/openstack/templates/zeromq 2015-01-20 12:04:36 +0000
22+++ charmhelpers/contrib/openstack/templates/zeromq 1970-01-01 00:00:00 +0000
23@@ -1,14 +0,0 @@
24-{% if zmq_host -%}
25-# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
26-rpc_backend = zmq
27-rpc_zmq_host = {{ zmq_host }}
28-{% if zmq_redis_address -%}
29-rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis
30-matchmaker_heartbeat_freq = 15
31-matchmaker_heartbeat_ttl = 30
32-[matchmaker_redis]
33-host = {{ zmq_redis_address }}
34-{% else -%}
35-rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
36-{% endif -%}
37-{% endif -%}

Subscribers

People subscribed via source and target branches