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

[James Page]

Misc fixes for 0mq templates for OpenStack Kilo.

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

337. By James Page on 2015-03-30

Rename zeromq snippet

[Liam Young (gnuoy)]

Approve

review: Approve

=== added file 'charmhelpers/contrib/openstack/templates/section-zeromq'
--- charmhelpers/contrib/openstack/templates/section-zeromq	1970-01-01 00:00:00 +0000
+++ charmhelpers/contrib/openstack/templates/section-zeromq	2015-03-30 15:20:18 +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 = redis
+matchmaker_heartbeat_freq = 15
+matchmaker_heartbeat_ttl = 30
+[matchmaker_redis]
+host = {{ zmq_redis_address }}
+{% else -%}
+rpc_zmq_matchmaker = ring
+{% endif -%}
+{% endif -%}

=== removed file 'charmhelpers/contrib/openstack/templates/zeromq'
--- charmhelpers/contrib/openstack/templates/zeromq	2015-01-20 12:04:36 +0000
+++ charmhelpers/contrib/openstack/templates/zeromq	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-{% 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 -%}