Merge lp:~pjdc/charms/trusty/rabbitmq-server/avoid-unresolvable-nodename-next-rebase into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[Paul Collins]

In one of the Openstack clouds I work with, reverse DNS lookup of a unit's private IP yields a result of the form os-A-B-C-D.instance.openstack.internal. The rabbitmq-server charm snips off the first component and assumes, without checking, that this is a usable nodename. For a number of reasons, that is not the case in this deployment. This MP adds an assertion to check that the result of the reverse lookup resolves in the forward direction. If this fails, we fall back in the same manner as when no PTR record is present, which allows rabbitmq-server to deploy successfully in the cloud I am using.

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

charm_lint_check #7920 rabbitmq-server-next for pjdc mp267733
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7920/

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

charm_unit_test #7338 rabbitmq-server-next for pjdc mp267733
    UNIT OK: passed

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

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

charm_amulet_test #5761 rabbitmq-server-next for pjdc mp267733
    AMULET OK: passed

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

Unmerged revisions

106. By Paul Collins on 2015-08-12

get_local_nodename: spell get_host_ip(nodename) correctly

105. By Paul Collins on 2015-08-12

get_local_nodename: ensure the resulting nodename itself resolves

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-07-16 20:41:49 +0000
+++ hooks/rabbitmq_server_relations.py	2015-08-12 05:08:34 +0000
@@ -112,6 +112,9 @@
     log('getting local nodename for ip address: %s' % ip_addr, level=INFO)
     try:
         nodename = get_hostname(ip_addr, fqdn=False)
+        # Ensure that the resulting nodename resolves;
+        # if we can't resolve it, neither can rabbitmq.
+        get_host_ip(nodename)
     except:
         log('Cannot resolve hostname for %s using DNS servers' % ip_addr,
             level='WARNING')