← Back to branch summary

~hopem/charm-helpers/fix-ssl-disable

« back to all changes in this revision

Viewing changes to charmhelpers/contrib/openstack/utils.py

  • Committer: Jorge Niedbalski
  • Date: 2015-02-26 23:24:22 UTC
  • Revision ID: jorge.niedbalski@canonical.com-20150226232422-dmk4zisgqp2m4tth
Minor lints

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/openstack/utils.py
18
18
 
19
19
# Common python helper functions used for OpenStack charms.
20
20
from collections import OrderedDict
21
 
from functools import wraps, partial
 
21
from functools import wraps
22
22
 
23
23
import subprocess
24
24
import json
422
422
    else:
423
423
        zap_disk(block_device)
424
424
 
425
 
is_ip = partial(ip.is_ip)
426
 
ns_query = partial(ip.ns_query)
427
 
get_host_ip = partial(ip.get_host_ip)
428
 
get_hostname = partial(ip.get_hostname)
 
425
is_ip = ip.is_ip
 
426
ns_query = ip.ns_query
 
427
get_host_ip = ip.get_host_ip
 
428
get_hostname = ip.get_hostname
429
429
 
430
430
 
431
431
def get_matchmaker_map(mm_file='/etc/oslo/matchmaker_ring.json'):