Use SSL path when SSL enabled
Change-Id: Id292e2411902f0e4f3ea86402ee58eb7d07bfd11 Closes-Bug: #1530119
This commit is contained in:
parent
294eb338fb
commit
3c1ffde9ae
|
@ -13,6 +13,11 @@ $region = hiera('region', 'RegionOne')
|
|||
$keystone_hash = hiera_hash('keystone', {})
|
||||
# enabled by default
|
||||
$public_ssl_hash = hiera('public_ssl')
|
||||
$ssl_hash = hiera_hash('use_ssl', {})
|
||||
|
||||
$public_ssl = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'usage', false)
|
||||
$public_ssl_path = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'path', [''])
|
||||
|
||||
#todo(sv): change to 'keystone' as soon as keystone as node-role was ready
|
||||
$keystones_address_map = get_node_to_ipaddr_map_by_network_role(get_nodes_hash_by_roles($network_metadata, ['primary-standalone-keystone', 'standalone-keystone']), 'keystone/api')
|
||||
|
||||
|
@ -45,7 +50,8 @@ class { '::openstack::ha::keystone':
|
|||
ipaddresses => $ipaddresses,
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
server_names => $server_names,
|
||||
public_ssl => $public_ssl_hash['services'],
|
||||
public_ssl => $public_ssl,
|
||||
public_ssl_path => $public_ssl_path,
|
||||
}
|
||||
|
||||
Package['socat'] -> Class['openstack::ha::keystone']
|
||||
|
|
Loading…
Reference in New Issue