aboutsummaryrefslogtreecommitdiff
path: root/docker/freezer
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-03 16:17:58 +0000
committerGerrit Code Review <review@openstack.org>2017-04-03 16:17:58 +0000
commit2d278ea347feb254232295b69a90955b588698c3 (patch)
treef42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/freezer
parenta728239f41a2f1bd9b42d635c596835c934a2698 (diff)
parent623e54da372563d068f0edf979b04996d70b306c (diff)
downloadkolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz
kolla-2d278ea347feb254232295b69a90955b588698c3.zip
Merge "Alphabetize packages"
Diffstat (limited to 'docker/freezer')
-rw-r--r--docker/freezer/freezer-api/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2
index f3b983153..8b809b4e9 100644
--- a/docker/freezer/freezer-api/Dockerfile.j2
+++ b/docker/freezer/freezer-api/Dockerfile.j2
@@ -14,9 +14,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set freezer_api_packages = [
- 'mod_wsgi',
+ 'httpd',
'mod_ssl',
- 'httpd'
+ 'mod_wsgi'
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}
@@ -25,8 +25,8 @@ 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
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set freezer_api_packages = [
- 'libapache2-mod-wsgi',
- 'apache2'
+ 'apache2',
+ 'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}