From dd8e1cb2eee2d0f767985425985c445743d04189 Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Fri, 4 Mar 2016 02:56:06 +0000
Subject: [PATCH] Fix horizon with ssl

Ubuntu did not have mod_headers enabled by default

Remove unused variable and adjust 'when' conditional positioning

TrivialFix

Change-Id: I82b8724526c24f4481a80165520d624f6a02c336
---
 ansible/group_vars/all.yml             | 1 -
 ansible/roles/haproxy/tasks/config.yml | 2 +-
 docker/horizon/Dockerfile.j2           | 8 +++++---
 etc/kolla/globals.yml                  | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 4b0525b756..ff0e4d2f0f 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -209,7 +209,6 @@ haproxy_user: "openstack"
 haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_internal_vip_address else 'yes' }}"
 kolla_enable_tls_external: "no"
 kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
-kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt"
 
 #################################
 # Cinder - Block Storage options
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml
index e41f6aa480..887af1aa5d 100644
--- a/ansible/roles/haproxy/tasks/config.yml
+++ b/ansible/roles/haproxy/tasks/config.yml
@@ -35,9 +35,9 @@
     - "keepalived"
 
 - name: Copying over haproxy.pem
-  when: kolla_enable_tls_external | bool
   copy:
     src: "{{ kolla_external_fqdn_cert }}"
     dest: "{{ node_config_directory }}/haproxy/{{ item }}"
   with_items:
     - "haproxy.pem"
+  when: kolla_enable_tls_external | bool
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 03a8dcb1b5..f1e8e4f3cd 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -26,7 +26,9 @@ RUN apt-get install -y --no-install-recommends \
         openstack-dashboard \
         apache2 \
         libapache2-mod-wsgi \
-    && apt-get clean
+    && echo > /etc/apache2/ports.conf \
+    && apt-get clean \
+    && ln -s ../mods-available/headers.load  /etc/apache2/mods-enabled/headers.load
 
 RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
     && sed -i "s|WEBROOT='/horizon/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py \
@@ -34,7 +36,6 @@ RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/opens
     && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
     && /usr/bin/python /usr/bin/manage.py collectstatic --noinput \
     && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
-    && echo "" > /etc/apache2/ports.conf \
     && rm /etc/openstack-dashboard/local_settings.py \
     && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
     && ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
@@ -57,7 +58,8 @@ RUN apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-wsgi \
     && echo > /etc/apache2/ports.conf \
-    && apt-get clean
+    && apt-get clean \
+    && ln -s ../mods-available/headers.load  /etc/apache2/mods-enabled/headers.load
 
     {% endif %}
 
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index a505b38309..e98f4e1216 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -80,7 +80,6 @@ neutron_external_interface: "eth1"
 # allow clients to perform authentication.  The default is TLS disabled.
 # kolla_enable_tls_external: "yes"
 # kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
-# kolla_external_fqdn_cacert: "{{ node_config_directory }}/certificates/haproxy-ca.crt"
 
 
 ####################