From 3c1ffde9ae649bd57bf7223ce83a07699e601665 Mon Sep 17 00:00:00 2001 From: Bartosz Kupidura Date: Thu, 7 Jan 2016 12:15:06 +0100 Subject: [PATCH] Use SSL path when SSL enabled Change-Id: Id292e2411902f0e4f3ea86402ee58eb7d07bfd11 Closes-Bug: #1530119 --- deployment_scripts/keystone-controller.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/keystone-controller.pp b/deployment_scripts/keystone-controller.pp index 2b575b3..a7ca203 100644 --- a/deployment_scripts/keystone-controller.pp +++ b/deployment_scripts/keystone-controller.pp @@ -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']