Merge lp:~niedbalski/charms/trusty/rabbitmq-server/stable-backport-1489053 into lp:charms/trusty/rabbitmq-server

[Jorge Niedbalski]

Backport of fix for LP: #1489053

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10580 rabbitmq-server for niedbalski mp272170
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12534576/
Build: http://10.245.162.77:8080/job/charm_lint_check/10580/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9768 rabbitmq-server for niedbalski mp272170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9768/

[Billy Olsen (billy-olsen)]

Changes LGTM - I'm awaiting the rest of OSCI's tests then I'll merge

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6714 rabbitmq-server for niedbalski mp272170
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6714/

[Billy Olsen (billy-olsen)]

LGTM, Approved!

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10681 rabbitmq-server for niedbalski mp272170
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12543376/
Build: http://10.245.162.77:8080/job/charm_lint_check/10681/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9863 rabbitmq-server for niedbalski mp272170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9863/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6720 rabbitmq-server for niedbalski mp272170
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6720/

[Jorge Niedbalski (niedbalski)]

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10698 rabbitmq-server for niedbalski mp272170
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12545759/
Build: http://10.245.162.77:8080/job/charm_lint_check/10698/

=== modified file 'hooks/charmhelpers/contrib/network/ip.py'
--- hooks/charmhelpers/contrib/network/ip.py	2015-09-23 12:04:43 +0000
+++ hooks/charmhelpers/contrib/network/ip.py	2015-09-23 19:38:09 +0000
@@ -437,8 +437,12 @@
 
         rev = dns.reversename.from_address(address)
         result = ns_query(rev)
+
         if not result:
-            return None
+            try:
+                result = socket.gethostbyaddr(address)[0]
+            except:
+                return None
     else:
         result = address
 

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-09-10 16:16:02 +0000
+++ hooks/rabbit_utils.py	2015-09-23 19:38:09 +0000
@@ -2,7 +2,6 @@
 import pwd
 import grp
 import re
-import socket
 import sys
 import subprocess
 import glob
@@ -270,18 +269,12 @@
                 address = relation_get('private-address',
                                        rid=r_id, unit=unit)
             if address is not None:
-                try:
-                    node = get_hostname(address, fqdn=False)
-                except:
+                node = get_hostname(address, fqdn=False)
+                if node:
+                    available_nodes.append(node)
+                else:
                     log('Cannot resolve hostname for {} '
                         'using DNS servers'.format(address), level='WARNING')
-                    log('Falling back to use socket.gethostname()',
-                        level='WARNING')
-                    # If the private-address is not resolvable using DNS
-                    # then use the current hostname
-                    node = socket.gethostname()
-
-                available_nodes.append(node)
 
     if len(available_nodes) == 0:
         log('No nodes available to cluster with')

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-09-10 16:16:02 +0000
+++ hooks/rabbitmq_server_relations.py	2015-09-23 19:38:09 +0000
@@ -273,11 +273,18 @@
 
 @hooks.hook('cluster-relation-joined')
 def cluster_joined(relation_id=None):
+    relation_settings = {
+        'hostname': get_local_nodename(),
+    }
+
     if config('prefer-ipv6'):
-        relation_settings = {'hostname': socket.gethostname(),
-                             'private-address': get_ipv6_addr()[0]}
-        relation_set(relation_id=relation_id,
-                     relation_settings=relation_settings)
+        relation_settings['private-address'] = get_ipv6_addr()[0]
+    else:
+        relation_settings['private-address'] = get_host_ip(
+            unit_get('private-address'))
+
+    relation_set(relation_id=relation_id,
+                 relation_settings=relation_settings)
 
     if is_relation_made('ha') and \
             config('ha-vip-only') is False:
@@ -324,10 +331,13 @@
         log('cluster_joined: cookie not yet set.', level=INFO)
         return
 
-    if config('prefer-ipv6') and rdata.get('hostname'):
-        private_address = rdata.get('private-address')
-        hostname = rdata.get('hostname')
-        if hostname:
+    rdata = relation_get()
+
+    if rdata:
+        hostname = rdata.get('hostname', None)
+        private_address = rdata.get('private-address', None)
+
+        if hostname and private_address:
             rabbit.update_hosts_file({private_address: hostname})
 
     if not is_sufficient_peers():