openstack/kolla
Code Issues Proposed changes

Merge "Fix Incorrect timezone in ubuntu horizon images"

Browse Source
This commit is contained in:
Jenkins 2017-05-12 09:42:06 +00:00 committed by Gerrit Code Review
commit e860e6cd4a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/horizon/Dockerfile.j2
View File

@ -50,11 +50,13 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'apache2', 'apache2',
'gettext', 'gettext',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
'locales',
'openstack-dashboard', 'openstack-dashboard',
'python-manila-ui', 'python-manila-ui',
'python-murano-dashboard', 'python-murano-dashboard',
'python-sahara-dashboard', 'python-sahara-dashboard',
'python-trove-dashboard' 'python-trove-dashboard',
'tzdata'
] %} ] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
@ -99,7 +101,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set horizon_packages = [ {% set horizon_packages = [
'apache2', 'apache2',
'gettext', 'gettext',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi',
'locales',
'tzdata'
] %} ] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}