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/ceilometer | |
| 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/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 69716b2dc..50edabe79 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -8,18 +8,18 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_api_packages = [ - 'openstack-ceilometer-api', 'httpd', + 'mod_ssl', 'mod_wsgi', - 'mod_ssl' + 'openstack-ceilometer-api' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} 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'] %} {% set ceilometer_api_packages = [ - 'ceilometer-api', 'apache2', + 'ceilometer-api', 'libapache2-mod-wsgi' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} @@ -32,10 +32,10 @@ RUN echo > /etc/apache2/ports.conf {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_api_packages = [ + 'gettext', 'httpd', - 'mod_wsgi', 'mod_ssl', - 'gettext' + 'mod_wsgi' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} @@ -49,8 +49,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set ceilometer_api_packages = [ 'apache2', - 'libapache2-mod-wsgi', - 'gettext' + 'gettext', + 'libapache2-mod-wsgi' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 552300dce..8e72335e8 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -14,9 +14,9 @@ MAINTAINER {{ maintainer }} {% set ceilometer_base_packages = [ 'openstack-ceilometer-common', 'python-gnocchiclient', - 'python-tooz', 'python-oslo-db', 'python-pecan', + 'python-tooz', 'python-wsme' ] %} {% elif base_distro in ['ubuntu'] %} |