Merge lp:~jjo/charms/trusty/rabbitmq-server/fix-nodename-to-host-dns-PTR into lp:charms/trusty/rabbitmq-server

[JuanJo Ciarlante]

[jjo] fixup rabbitmq nodename to DNS's PTR for node ip, to make it match peer's join_cluster.
Seems to fix lp#1342539.

[lp:~jjo/charms/trusty/rabbitmq-server/fix-nodename-to-host-dns-PTR]

60. By David Britton on 2014-09-27

resync charmhelpers, make use of version compare from charmhelpers. [r=dpb] [a=tribaal]

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1114-results

review: Needs Fixing (automated testing)

[lp:~jjo/charms/trusty/rabbitmq-server/fix-nodename-to-host-dns-PTR]

61. By Liam Young on 2014-09-29

[davidpbritton, r=hopem, r=gnuoy]
- make use of new compare_versions logic in charm helpers (fixing lp:1375084)
- add unit test for the same

62. By JuanJo Ciarlante on 2014-10-01

[jjo] fixup rabbitmq nodename to DNS's PTR for node ip, to make it match peer's join_cluster

[JuanJo Ciarlante (jjo)]

Fixed text conflicts by resyncing over r61, PTAL.

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-09-29 03:59:17 +0000
+++ hooks/rabbitmq_server_relations.py	2014-10-01 11:55:45 +0000
@@ -15,6 +15,10 @@
     is_clustered,
     eligible_leader
 )
+from charmhelpers.contrib.openstack.utils import (
+    get_hostname,
+    get_host_ip
+)
 
 import charmhelpers.contrib.storage.linux.ceph as ceph
 from charmhelpers.contrib.openstack.utils import save_script_rc
@@ -146,6 +150,18 @@
             'rabbitmq cluster config.')
         return
 
+    # Set RABBITMQ_NODENAME to something that's resolvable by my peers
+    # get_host_ip() is called to sanitize private-address in case it
+    # doesn't return an IP address
+    nodename = get_hostname(get_host_ip(unit_get('private-address')),
+                            fqdn=False)
+    if nodename:
+        log('forcing nodename=%s' % nodename)
+        # need to stop it under current nodename
+        service_stop('rabbitmq-server')
+        rabbit.set_node_name('rabbit@%s' % nodename)
+        service_restart('rabbitmq-server')
+
     if is_newer():
         log('cluster_joined: Relation greater.')
         return