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/heat | |
| 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/heat')
| -rw-r--r-- | docker/heat/heat-all/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2 index ea7f6d8d5..9acb73965 100644 --- a/docker/heat/heat-all/Dockerfile.j2 +++ b/docker/heat/heat-all/Dockerfile.j2 @@ -9,8 +9,8 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heat_all_packages = [ 'openstack-heat-api', - 'openstack-heat-monolith', - 'openstack-heat-engine' + 'openstack-heat-engine', + 'openstack-heat-monolith' ] %} {% elif base_distro in ['ubuntu'] %} RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 933c9e429..40fb62468 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -11,19 +11,19 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heat_base_packages = [ - 'openstack-heat-common', 'httpd', + 'mod_ssl', 'mod_wsgi', - 'mod_ssl' + 'openstack-heat-common' ] %} {{ macros.install_packages(heat_base_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 heat_base_packages = [ - 'heat-common', 'apache2', - 'libapache2-mod-wsgi', + 'heat-common', + 'libapache2-mod-wsgi' ] %} {{ macros.install_packages(heat_base_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf @@ -35,8 +35,8 @@ RUN echo > /etc/apache2/ports.conf {% set heat_base_packages = [ 'httpd', - 'mod_wsgi', - 'mod_ssl' + 'mod_ssl', + 'mod_wsgi' ] %} {{ macros.install_packages(heat_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ |
