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

Merge "Enable haproxy on controller role in all cases"

This commit is contained in:
Jenkins 2015-12-23 16:47:33 +00:00 committed by Gerrit Code Review
parent 9e43b8d89a 73b7c6e286
commit 02eb42d56b
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/keystone-controller.pp
View File

@ -1,4 +1,4 @@
notice('MODULAR: detach-keystone/controller-keystone.pp')
notice('MODULAR: detach-keystone/keystone-controller.pp')
$network_metadata = hiera('network_metadata')
$access_hash = hiera_hash('access',{})
@ -32,8 +32,7 @@ class { 'openstack::auth_file':
murano_repo_url => $murano_repo_url,
}
# Enable keystone on public VIP only if SSL for services is enabled
if ($public_ssl_hash['services']) {
# Enable keystone HAProxy on controller so public VIP can be used
$server_names = pick(hiera_array('keystone_names', undef),
keys($keystones_address_map))
$ipaddresses = pick(hiera_array('keystone_ipaddresses', undef),