stackforge/puppet-openstack-cloud
Code Issues Proposed changes

loadbalancer: add horizon ssl support

Browse Source 
Add a new param (false by default) to activate SSL on Horizon HAproxy
pool.

feature #337
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-03-05 14:40:24 +01:00
parent 1bc4088490
commit b629cc102f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/loadbalancer.pp
View File

@@ -31,6 +31,7 @@ class cloud::loadbalancer(
$keystone_api_admin = true, $keystone_api_admin = true,
$keystone_api = true, $keystone_api = true,
$horizon = true, $horizon = true,
$horizon_ssl = false,
$spice = true, $spice = true,
$haproxy_auth = $os_params::haproxy_auth, $haproxy_auth = $os_params::haproxy_auth,
$keepalived_state = 'BACKUP', $keepalived_state = 'BACKUP',
@@ -199,12 +200,20 @@ class cloud::loadbalancer(
} }
} }
if $horizon { if $horizon {
if $horizon_ssl {
cloud::loadbalancer::listen_https{
'horizon_cluster':
ports => $horizon_port,
listen_ip => $vip_public_ip;
}
} else {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'horizon_cluster': 'horizon_cluster':
ports => $horizon_port, ports => $horizon_port,
listen_ip => $vip_public_ip; listen_ip => $vip_public_ip;
} }
} }
}
haproxy::listen { 'galera_cluster': haproxy::listen { 'galera_cluster':
ipaddress => $galera_ip, ipaddress => $galera_ip,

1
spec/classes/cloud_loadbalancer_spec.rb
View File

@@ -37,6 +37,7 @@ describe 'cloud::loadbalancer' do
:keystone_api_admin => true, :keystone_api_admin => true,
:keystone_api => true, :keystone_api => true,
:horizon => true, :horizon => true,
:horizon_ssl => false,
:spice => true, :spice => true,
:haproxy_auth => 'root:secrete', :haproxy_auth => 'root:secrete',
:keepalived_state => 'BACKUP', :keepalived_state => 'BACKUP',