← Back to branch summary

~ben-kaehne/+junk/rabbitmq-server1

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/network/ip.py

  • Committer: Jorge Niedbalski
  • Date: 2015-09-24 19:16:55 UTC
  • mfrom: (103.1.1 rabbitmq-server-trunk)
  • Revision ID: jorge.niedbalski@canonical.com-20150924191655-wylnuo9marfynmph
[niedbalski, r=billy-olsen] Backport to fix LP: #1489053.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/network/ip.py
437
437
 
438
438
        rev = dns.reversename.from_address(address)
439
439
        result = ns_query(rev)
 
440
 
440
441
        if not result:
441
 
            return None
 
442
            try:
 
443
                result = socket.gethostbyaddr(address)[0]
 
444
            except:
 
445
                return None
442
446
    else:
443
447
        result = address
444
448