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

41
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') $network_metadata = hiera('network_metadata')
$access_hash = hiera_hash('access',{}) $access_hash = hiera_hash('access',{})
@ -32,24 +32,23 @@ class { 'openstack::auth_file':
murano_repo_url => $murano_repo_url, murano_repo_url => $murano_repo_url,
} }
# Enable keystone on public VIP only if SSL for services is enabled # Enable keystone HAProxy on controller so public VIP can be used
if ($public_ssl_hash['services']) { $server_names = pick(hiera_array('keystone_names', undef),
$server_names = pick(hiera_array('keystone_names', undef), keys($keystones_address_map))
keys($keystones_address_map)) $ipaddresses = pick(hiera_array('keystone_ipaddresses', undef),
$ipaddresses = pick(hiera_array('keystone_ipaddresses', undef), values($keystones_address_map))
values($keystones_address_map)) $public_virtual_ip = hiera('public_vip')
$public_virtual_ip = hiera('public_vip') $internal_virtual_ip = hiera('management_vip')
$internal_virtual_ip = hiera('management_vip') # configure keystone ha proxy
# configure keystone ha proxy class { '::openstack::ha::keystone':
class { '::openstack::ha::keystone': internal_virtual_ip => $internal_virtual_ip,
internal_virtual_ip => $internal_virtual_ip, ipaddresses => $ipaddresses,
ipaddresses => $ipaddresses, public_virtual_ip => $public_virtual_ip,
public_virtual_ip => $public_virtual_ip, server_names => $server_names,
server_names => $server_names, public_ssl => $public_ssl_hash['services'],
public_ssl => $public_ssl_hash['services'], }
} Package['socat'] -> Class['openstack::ha::keystone']
Package['socat'] -> Class['openstack::ha::keystone'] package { 'socat':
package { 'socat': ensure => 'present',
ensure => 'present', }
}
} }