diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 4a35d2c4..3c9734cd 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -78,6 +78,7 @@ class cloud::dashboard( $ks_keystone_internal_host = '127.0.0.1', $secret_key = 'secrete', $horizon_port = 80, + $horizon_ssl_port = 443, $servername = $::fqdn, $api_eth = '127.0.0.1', $listen_ssl = false, @@ -141,5 +142,16 @@ class cloud::dashboard( options => "check inter 2000 rise 2 fall 5 cookie ${::hostname}" } + if $listen_ssl { + + @@haproxy::balancermember{"${::fqdn}-horizon-ssl": + listening_service => 'horizon_ssl_cluster', + server_names => $::hostname, + ipaddresses => $api_eth, + ports => $horizon_ssl_port, + options => "check inter 2000 rise 2 fall 5 cookie ${::hostname}" + } + + } } diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 8dd98876..c236a890 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -196,6 +196,7 @@ class cloud::loadbalancer( $ks_nova_public_port = 8774, $ks_swift_public_port = 8080, $horizon_port = 80, + $horizon_ssl_port = 443, $spice_port = 6082, $vip_public_ip = ['127.0.0.1'], $vip_internal_ip = false, @@ -347,8 +348,8 @@ class cloud::loadbalancer( if $horizon { if $horizon_ssl { - cloud::loadbalancer::listen_https{ 'horizon_cluster': - ports => $horizon_port, + cloud::loadbalancer::listen_https{ 'horizon_ssl_cluster': + ports => $horizon_ssl_port, listen_ip => $vip_public_ip; } } else { diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb index 9a87264a..7b78fd4e 100644 --- a/spec/classes/cloud_loadbalancer_spec.rb +++ b/spec/classes/cloud_loadbalancer_spec.rb @@ -45,6 +45,7 @@ describe 'cloud::loadbalancer' do :keepalived_public_interface => 'eth0', :keepalived_public_ipvs => ['10.0.0.1', '10.0.0.2'], :horizon_port => '80', + :horizon_ssl_port => '443', :spice_port => '6082', :vip_public_ip => '10.0.0.1', :galera_ip => '10.0.0.2',