openstack/charm-keystone
Code Issues Proposed changes

sync with lp:~xianghui/charm-helpers/lp1385162, use get_adrresses() in charms-helpers instead.

Browse Source
This commit is contained in:
Hui Xiang
2014-11-13 22:26:56 +08:00
parent aeedf0d666
commit 921acaa85f
3 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
hooks/keystone_context.py
View File

@@ -1,4 +1,4 @@
from charmhelpers.core.hookenv import config, unit_get, log
from charmhelpers.core.hookenv import config
from charmhelpers.core.host import mkdir, write_file
@@ -6,15 +6,11 @@ from charmhelpers.contrib.openstack import context
from charmhelpers.contrib.hahelpers.cluster import (
determine_apache_port,
determine_api_port,
is_clustered
determine_api_port
)
from charmhelpers.contrib.hahelpers.apache import install_ca_cert
from charmhelpers.contrib.network.ip import (
get_address_in_network, is_address_in_network)
import os
CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
@@ -49,29 +45,12 @@ class ApacheSSLContext(context.ApacheSSLContext):
install_ca_cert(ca.get_ca_bundle())
def canonical_names(self):
addresses = []
vips = []
if config('vip'):
vips = config('vip').split()
for network_type in ['os-internal-network',
'os-admin-network',
'os-public-network']:
address = get_address_in_network(config(network_type),
unit_get('private-address'))
if len(vips) > 1 and is_clustered():
if not config(network_type):
log("Multinet is used, but network_type (%s) is None."
% network_type, level='WARNING')
continue
for vip in vips:
if is_address_in_network(config(network_type), vip):
addresses.append(vip)
break
elif is_clustered():
addresses.append(config('vip'))
else:
addresses.append(address)
return list(set(addresses))
addresses = self.get_addresses()
addrs = []
for address, endpoint in addresses:
addrs.append(endpoint)
return list(set(addrs))
class HAProxyContext(context.HAProxyContext):