Merge lp:~niedbalski/charms/trusty/rabbitmq-server/fix-1378263 into lp:charms/trusty/rabbitmq-server

[Jorge Niedbalski]

- If there is no a valid DNS response ( A or PTR ) for the current hostname, use the current socket.gethostname() returned address.

Fixes LP: #1378263

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #917 trusty-rabbitmq-server for niedbalski mp240478
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option vip has no default value
  I: config.yaml: option key has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/8805428/
Build: http://10.98.191.181:8080/job/charm_lint_check/917/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #335 trusty-rabbitmq-server for niedbalski mp240478
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/8805427/
Build: http://10.98.191.181:8080/job/charm_amulet_test/335/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #752 trusty-rabbitmq-server for niedbalski mp240478
    UNIT OK: passed

UNIT Results (max last 5 lines):
INFO:root:command: make -f Makefile test
  Starting tests...
  CHARM_DIR=/var/lib/jenkins/checkout/trusty-rabbitmq-server PYTHONPATH=/var/lib/jenkins/checkout/trusty-rabbitmq-server/hooks nosetests /var/lib/jenkins/checkout/trusty-rabbitmq-server/hooks
  Ran 1 test in 0.146s
  OK

Full unit test output: http://paste.ubuntu.com/8805429/
Build: http://10.98.191.181:8080/job/charm_unit_test/752/

[lp:~niedbalski/charms/trusty/rabbitmq-server/fix-1378263]

67. By Jorge Niedbalski on 2014-11-03

- Improved no hostname found dns message

68. By Jorge Niedbalski on 2014-11-03

- Refactored according to @freyes comment

[Felipe Reyes (freyes)]

Looks good to me.

Regarding the use of socket.gethostname() to bypass DNS problems, I patched locally with this same approach and worked for me.

review: Approve

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #336 trusty-rabbitmq-server for niedbalski mp240478
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/8805665/
Build: http://10.98.191.181:8080/job/charm_amulet_test/336/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #918 trusty-rabbitmq-server for niedbalski mp240478
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option vip has no default value
  I: config.yaml: option key has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/8805667/
Build: http://10.98.191.181:8080/job/charm_lint_check/918/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #753 trusty-rabbitmq-server for niedbalski mp240478
    UNIT OK: passed

UNIT Results (max last 5 lines):
INFO:root:command: make -f Makefile test
  Starting tests...
  CHARM_DIR=/var/lib/jenkins/checkout/trusty-rabbitmq-server PYTHONPATH=/var/lib/jenkins/checkout/trusty-rabbitmq-server/hooks nosetests /var/lib/jenkins/checkout/trusty-rabbitmq-server/hooks
  Ran 1 test in 0.134s
  OK

Full unit test output: http://paste.ubuntu.com/8805668/
Build: http://10.98.191.181:8080/job/charm_unit_test/753/

[Jorge Niedbalski (niedbalski)]

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-10-29 14:12:26 +0000
+++ hooks/rabbitmq_server_relations.py	2014-11-03 17:29:52 +0000
@@ -5,6 +5,7 @@
 import sys
 import subprocess
 import glob
+import socket
 
 import rabbit_utils as rabbit
 from lib.utils import (
@@ -163,8 +164,16 @@
     # 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)
+    ip_addr = get_host_ip(unit_get('private-address'))
+    try:
+        nodename = get_hostname(ip_addr, fqdn=False)
+    except:
+        log('Cannot resolve hostname for %s using DNS servers' % ip_addr)
+        log('Falling back to use socket.gethostname()')
+        #If the private-address is not resolvable using DNS
+        # then use the current hostname
+        nodename = socket.gethostname()
+
     if nodename:
         log('forcing nodename=%s' % nodename)
         # need to stop it under current nodename