diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/heat | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
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 \ |
