diff options
| -rw-r--r-- | lib/facter/alt_fqdns.rb | 16 | ||||
| -rw-r--r-- | manifests/certmonger/haproxy.pp | 1 | ||||
| -rw-r--r-- | manifests/haproxy.pp | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/lib/facter/alt_fqdns.rb b/lib/facter/alt_fqdns.rb index 216beef..2d78b9a 100644 --- a/lib/facter/alt_fqdns.rb +++ b/lib/facter/alt_fqdns.rb @@ -19,26 +19,16 @@ 'storage_mgmt', 'tenant', 'management', + 'ctlplane', ].each do |network| Facter.add('fqdn_' + network) do setcode do - external_hostname_parts = [ + hostname_parts = [ Facter.value(:hostname), network.gsub('_', ''), Facter.value(:domain), ].reject { |part| part.nil? || part.empty? } - external_hostname_parts.join(".") + hostname_parts.join(".") end end end -# map ctlplane network to management fqdn -Facter.add('fqdn_ctlplane') do - setcode do - hostname_parts = [ - Facter.value(:hostname), - 'management', - Facter.value(:domain), - ].reject { |part| part.nil? || part.empty? } - hostname_parts.join(".") - end -end diff --git a/manifests/certmonger/haproxy.pp b/manifests/certmonger/haproxy.pp index 2b738e6..0168227 100644 --- a/manifests/certmonger/haproxy.pp +++ b/manifests/certmonger/haproxy.pp @@ -49,6 +49,7 @@ define tripleo::certmonger::haproxy ( ){ certmonger_certificate { "${title}-cert": hostname => $hostname, + dnsname => $hostname, certfile => $service_certificate, keyfile => $service_key, postsave_cmd => $postsave_cmd, diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index e1f5d50..6044eba 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -593,6 +593,11 @@ class tripleo::haproxy ( service_port => $ports[manila_api_port], ip_addresses => hiera('manila_api_node_ips', $controller_hosts_real), server_names => $controller_hosts_names_real, + listen_options => { + 'http-request' => [ + 'set-header X-Forwarded-Proto https if { ssl_fc }', + 'set-header X-Forwarded-Proto http if !{ ssl_fc }'], + }, public_ssl_port => $ports[manila_api_ssl_port], } } |