← Back to branch summary

~jorge/charms/precise/cinder/fix-README

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/context.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-07 09:01:49 UTC
  • Revision ID: james.page@ubuntu.com-20141007090149-9yiwd84kvlu72bb6
[trivial] Resync to fixup MAAS support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/context.py
57
57
    is_address_in_network
58
58
)
59
59
 
 
60
from charmhelpers.contrib.openstack.utils import get_host_ip
 
61
 
60
62
CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
61
63
 
62
64
 
429
431
        if config('prefer-ipv6'):
430
432
            addr = get_ipv6_addr(exc_list=[config('vip')])[0]
431
433
        else:
432
 
            addr = unit_get('private-address')
 
434
            addr = get_host_ip(unit_get('private-address'))
433
435
 
434
436
        cluster_hosts = {}
435
437