aboutsummaryrefslogtreecommitdiff
path: root/docker/gnocchi
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/gnocchi
parenta728239f41a2f1bd9b42d635c596835c934a2698 (diff)
parent623e54da372563d068f0edf979b04996d70b306c (diff)
downloadkolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz
kolla-2d278ea347feb254232295b69a90955b588698c3.zip
Merge "Alphabetize packages"
Diffstat (limited to 'docker/gnocchi')
-rw-r--r--docker/gnocchi/gnocchi-base/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 2011dec33..17b6afc38 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -11,10 +11,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [
- 'openstack-gnocchi-common',
'httpd',
- 'mod_wsgi',
'mod_ssl',
+ 'mod_wsgi',
+ 'openstack-gnocchi-common',
'python-ldappool',
'python-rados'
] %}
@@ -25,8 +25,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_base_packages = [
- 'gnocchi-common',
'apache2',
+ 'gnocchi-common',
'libapache2-mod-wsgi',
'python-ldappool',
'python-rados'
@@ -41,8 +41,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% set gnocchi_base_packages = [
'httpd',
- 'mod_wsgi',
'mod_ssl',
+ 'mod_wsgi',
'python-ldappool',
'python-rados'
] %}