From 623e54da372563d068f0edf979b04996d70b306c Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Thu, 23 Mar 2017 20:06:50 +0000 Subject: Alphabetize packages Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991 --- docker/nova/nova-api/Dockerfile.j2 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docker/nova/nova-api') diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index ae08ffe65..f6cd1794b 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -9,10 +9,10 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_api_packages = [ - 'openstack-nova-api', 'httpd', + 'mod_ssl', 'mod_wsgi', - 'mod_ssl' + 'openstack-nova-api' ] %} {{ macros.install_packages(nova_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ @@ -21,10 +21,10 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_distro in ['ubuntu'] %} {% set nova_api_packages = [ - 'nova-api', - 'python-memcache', 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi', + 'nova-api', + 'python-memcache' ] %} {{ macros.install_packages(nova_api_packages | customizable("packages")) }} @@ -37,8 +37,8 @@ RUN echo > /etc/apache2/ports.conf {% set nova_api_packages = [ 'httpd', - 'mod_wsgi', - 'mod_ssl' + 'mod_ssl', + 'mod_wsgi' ] %} {{ macros.install_packages(nova_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ -- cgit v1.2.3