diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-23 20:06:50 +0000 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-28 16:45:16 +0100 |
| commit | 623e54da372563d068f0edf979b04996d70b306c (patch) | |
| tree | 10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/gnocchi | |
| parent | ce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff) | |
| download | kolla-623e54da372563d068f0edf979b04996d70b306c.tar.gz kolla-623e54da372563d068f0edf979b04996d70b306c.zip | |
Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.
Change-Id: I906ed89c10b12886665618752f525ba71d83d991
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 8 |
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' ] %} |