diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 10:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 10:14:03 +0000 |
| commit | 3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch) | |
| tree | d923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/horizon/Dockerfile.j2 | |
| parent | a130ecb153f555ffd96bebf554eaa10c34a1486d (diff) | |
| parent | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff) | |
| download | kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip | |
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/horizon/Dockerfile.j2')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index bc6d511cc..4474da954 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -44,7 +44,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) {% endblock %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set horizon_packages = [ 'apache2', @@ -94,7 +94,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf {% endblock %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set horizon_packages = [ 'apache2', |