Merge "Alphabetize packages"

4 files changed, 17 insertions, 17 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index a99dba4bd..828dcd943 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -8,18 +8,18 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set cinder_api_packages = [
-                'python-keystone',
                 'httpd',
+                'mod_ssl',
                 'mod_wsgi',
-                'mod_ssl'
+                'python-keystone'
         ] %}
 {{ macros.install_packages(cinder_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 cinder_api_packages = [
-                'cinder-api',
                 'apache2',
+                'cinder-api',
                 'libapache2-mod-wsgi'
         ] %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
@@ -30,8 +30,8 @@ RUN echo > /etc/apache2/ports.conf
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set cinder_api_packages = [
                 'httpd',
-                'mod_wsgi',
-                'mod_ssl'
+                'mod_ssl',
+                'mod_wsgi'
         ] %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index cd8ddaed8..87e0ffe04 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -12,8 +12,8 @@ MAINTAINER {{ maintainer }}
         ] %}
     {% elif base_distro in ['ubuntu'] %}
         {% set cinder_backup_packages = [
-                'nfs-common',
-                'cinder-backup'
+                'cinder-backup',
+                'nfs-common'
         ] %}
     {% endif %}
 
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 531637b76..5e3052058 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -10,15 +10,15 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set cinder_base_packages = [
-                'openstack-cinder',
-                'python-automaton',
+                'ceph-common',
                 'lvm2',
-                'ceph-common'
+                'openstack-cinder',
+                'python-automaton'
         ] %}
     {% elif base_distro in ['ubuntu'] %}
         {% set cinder_base_packages = [
-                'cinder-common',
                 'ceph-common',
+                'cinder-common',
                 'lvm2'
         ] %}
     {% endif %}
@@ -27,15 +27,15 @@ MAINTAINER {{ maintainer }}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set cinder_base_packages = [
+                'ceph-common',
                 'lvm2',
-                'qemu-img',
-                'ceph-common'
+                'qemu-img'
         ] %}
      {% elif base_distro in ['ubuntu', 'debian'] %}
         {% set cinder_base_packages = [
+                'ceph-common',
                 'lvm2',
-                'qemu-utils',
-                'ceph-common'
+                'qemu-utils'
         ] %}
     {% endif %}
 {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 184eeb6e1..b2b91b24d 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -18,8 +18,8 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
 
 {% elif base_distro in ['ubuntu', 'debian'] %}
     {% set cinder_volume_packages = [
-            'tgt',
-            'nfs-common'
+            'nfs-common',
+            'tgt'
     ] %}
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}