x
/
fuel-plugin-detach-keystone
Code Issues Proposed changes

Adjust openrc creation to use whole auth url 

Closes-bug: #1533588

Change-Id: Ifb8a4c9b2724a83310ab697aa4f3187113d3ccf7
Depends-on: #Ic3a70137e95df91c8e8fa257f16274e68075c800
This commit is contained in:
Vladimir Kuklin 2016-01-29 21:43:45 +03:00
parent 22a7972e03
commit bf42642f9d
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deployment_scripts/keystone-controller.pp
View File

@ -3,6 +3,8 @@ notice('MODULAR: detach-keystone/keystone-controller.pp')
$network_metadata = hiera('network_metadata')
$access_hash = hiera_hash('access',{})
$service_endpoint = hiera('service_endpoint')
$management_vip = hiera('management_vip')
$public_vip = hiera('public_vip')
$admin_tenant = $access_hash['tenant']
$admin_email = $access_hash['email']
@ -21,6 +23,25 @@ $public_ssl_path = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'pu
#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')
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'protocol', 'http')
$public_address = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'hostname', [$public_vip])
$public_port = '5000'
$internal_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http')
$internal_address = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint, $management_vip])
$internal_port = '5000'
$admin_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'protocol', 'http')
$admin_address = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', [$service_endpoint, $management_vip])
$admin_port = '35357'
$public_url = "${public_protocol}://${public_address}:${public_port}"
$admin_url = "${admin_protocol}://${admin_address}:${admin_port}"
$internal_url = "${internal_protocol}://${internal_address}:${internal_port}"
$auth_suffix = pick($keystone_hash['auth_suffix'], '/v2.0')
$auth_url = "${internal_url}${auth_suffix}"
$murano_settings_hash = hiera('murano_settings', {})
if has_key($murano_settings_hash, 'murano_repo_url') {
$murano_repo_url = $murano_settings_hash['murano_repo_url']
@ -33,7 +54,7 @@ class { 'openstack::auth_file':
admin_password => $admin_password,
admin_tenant => $admin_tenant,
region_name => $region,
controller_node => $service_endpoint,
auth_url => $auth_url,
murano_repo_url => $murano_repo_url,
}
@ -42,13 +63,11 @@ $server_names = pick(hiera_array('keystone_names', undef),
keys($keystones_address_map))
$ipaddresses = pick(hiera_array('keystone_ipaddresses', undef),
values($keystones_address_map))
$public_virtual_ip = hiera('public_vip')
$internal_virtual_ip = hiera('management_vip')
# configure keystone ha proxy
class { '::openstack::ha::keystone':
internal_virtual_ip => $internal_virtual_ip,
internal_virtual_ip => $management_vip,
ipaddresses => $ipaddresses,
public_virtual_ip => $public_virtual_ip,
public_virtual_ip => $public_vip,
server_names => $server_names,
public_ssl => $public_ssl,
public_ssl_path => $public_ssl_path,