Merge "Trivial fix horizon's healthcheck when SSL turned on" into stable/wallaby

Author: Zuul

ansible/group_vars/all.yml

@@ -326,7 +326,7 @@ heat_api_cfn_listen_port: "{{ heat_api_cfn_port }}"
 
 horizon_port: "80"
 horizon_tls_port: "443"
-horizon_listen_port: "{{ horizon_port }}"
+horizon_listen_port: "{{ horizon_tls_port if horizon_enable_tls_backend | bool else horizon_port }}"
 
 influxdb_http_port: "8086"
 

ansible/roles/horizon/templates/horizon.conf.j2

@@ -13,7 +13,7 @@ ServerSignature Off
 ServerTokens Prod
 TraceEnable off
 
-<VirtualHost *:{{ horizon_listen_port }}>
+<VirtualHost {{ api_interface_address }}:{{ horizon_listen_port }}>
     LogLevel warn
     ErrorLog /var/log/kolla/horizon/horizon.log
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
@@ -50,11 +50,6 @@ TraceEnable off
 {% endif %}
 </VirtualHost>
 
-{# FIXME(yoctozepto): enabling of either tls will break the other if not enabled too #}
-{% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %}
-Header edit Location ^http://(.*)$ https://$1
-{% endif %}
-
 <IfModule mod_deflate.c>
     # Compress HTML, CSS, JavaScript, Json, Text, XML and fonts
     AddOutputFilterByType DEFLATE application/javascript

releasenotes/notes/bug-1933846-122a62e9724b638c.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes horizon's healthcheck when SSL is turned on.
+    `LP#1933846 <https://launchpad.net/bugs/1933846>`__