diff options
| author | SamYaple <sam@yaple.net> | 2016-03-04 02:56:06 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2016-03-04 14:51:50 +0000 |
| commit | dd8e1cb2eee2d0f767985425985c445743d04189 (patch) | |
| tree | 109a0bfb5969dbd9f0a959035db3199519aba97b /docker | |
| parent | ebc1bbb08132f1cc638ea3c18773ce95fbe421c4 (diff) | |
| download | kolla-dd8e1cb2eee2d0f767985425985c445743d04189.tar.gz kolla-dd8e1cb2eee2d0f767985425985c445743d04189.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 03a8dcb1b..f1e8e4f3c 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 %} |