← Back to branch summary

~adam-collard/charms/trusty/rabbitmq-server/fix-le-ignore-min-cluster

« back to all changes in this revision

Viewing changes to hooks/rabbit_utils.py

  • Committer: billy.olsen at canonical
  • Date: 2015-09-01 04:53:33 UTC
  • Revision ID: billy.olsen@canonical.com-20150901045333-sstcvt6exd5b005d
[billy-olsen,r=trivial] Undo last 2 commits which has rabbit in a
bad state.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/rabbit_utils.py
2
2
import pwd
3
3
import grp
4
4
import re
 
5
import socket
5
6
import sys
6
7
import subprocess
7
8
import glob
269
270
                address = relation_get('private-address',
270
271
                                       rid=r_id, unit=unit)
271
272
            if address is not None:
272
 
                node = get_hostname(address, fqdn=False)
273
 
                if node:
274
 
                    available_nodes.append(node)
 
273
                try:
 
274
                    node = get_hostname(address, fqdn=False)
 
275
                except:
 
276
                    log('Cannot resolve hostname for {} '
 
277
                        'using DNS servers'.format(address), level='WARNING')
 
278
                    log('Falling back to use socket.gethostname()',
 
279
                        level='WARNING')
 
280
                    # If the private-address is not resolvable using DNS
 
281
                    # then use the current hostname
 
282
                    node = socket.gethostname()
 
283
 
 
284
                available_nodes.append(node)
275
285
 
276
286
    if len(available_nodes) == 0:
277
287
        log('No nodes available to cluster with')