Alphabetize packages

Some images have packages sorted alphabetically and some not.
Unify common style between all images.

Change-Id: I906ed89c10b12886665618752f525ba71d83d991

6 files changed, 60 insertions, 60 deletions

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 \
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 9c3014ce0..c8aac292d 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -11,20 +11,20 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_base_packages = [
+                'bridge-utils',
                 'openstack-nova-common',
-                'python-keystoneclient',
+                'openvswitch',
                 'python-cinderclient',
-                'bridge-utils',
-                'openvswitch'
+                'python-keystoneclient'
         ] %}
 
     {% elif base_distro in ['ubuntu'] %}
 
         {% set nova_base_packages = [
-                'nova-common',
-                'python-nova',
                 'bridge-utils',
-                'openvswitch-switch'
+                'nova-common',
+                'openvswitch-switch',
+                'python-nova'
         ] %}
 
     {% endif %}
@@ -42,14 +42,14 @@ MAINTAINER {{ maintainer }}
     {% elif base_distro in ['ubuntu', 'debian'] %}
 
         {% set nova_base_packages = [
-            'iptables',
-            'iproute2',
-            'ebtables',
-            'dnsmasq',
             'bridge-utils',
-            'python-libvirt',
+            'dnsmasq',
+            'ebtables',
+            'iproute2',
+            'iptables',
             'openssh-client',
-            'openvswitch-switch'
+            'openvswitch-switch',
+            'python-libvirt'
         ] %}
 
     {% endif %}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 614f5e2b0..164abf83e 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -9,15 +9,15 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_compute_packages = [
-            'openstack-nova-compute',
-            'openvswitch',
-            'sysfsutils',
             'ceph-common',
             'genisoimage',
             'iscsi-initiator-utils',
             'nfs-utils',
-            'targetcli',
-            'python-rtslib'
+            'openstack-nova-compute',
+            'openvswitch',
+            'python-rtslib',
+            'sysfsutils',
+            'targetcli'
         ] %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -26,17 +26,17 @@ MAINTAINER {{ maintainer }}
 
         # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
         {% set nova_compute_packages = [
-            'nova-compute',
-            'openvswitch-switch',
-            'sysfsutils',
             'ceph-common',
-            'ironic-common',
-            'python-ironicclient',
             'genisoimage',
+            'ironic-common',
             'nfs-common',
+            'nova-compute',
+            'openvswitch-switch',
             'open-iscsi',
-            'targetcli',
-            'python-rtslib'
+            'python-ironicclient',
+            'python-rtslib',
+            'sysfsutils',
+            'targetcli'
         ] %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -48,33 +48,33 @@ RUN rm -f /etc/nova/nova-compute.conf
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_compute_packages = [
+            'ceph-common',
             'dosfstools',
+            'genisoimage',
+            'iscsi-initiator-utils',
             'libvirt-devel',
             'libosinfo',
+            'nfs-utils',
             'openvswitch',
+            'python-rtslib',
             'qemu-img',
             'sysfsutils',
-            'ceph-common',
-            'genisoimage',
-            'iscsi-initiator-utils',
-            'nfs-utils',
-            'targetcli',
-            'python-rtslib'
+            'targetcli'
         ] %}
 
     {% elif base_distro in ['ubuntu', 'debian'] %}
 
         {% set nova_compute_packages = [
+            'ceph-common',
             'dosfstools',
+            'genisoimage',
             'libosinfo-bin',
             'libvirt-dev',
-            'qemu-utils',
-            'ceph-common',
-            'genisoimage',
             'nfs-common',
             'open-iscsi',
-            'targetcli',
-            'python-rtslib'
+            'python-rtslib',
+            'qemu-utils',
+            'targetcli'
         ] %}
 
 RUN mkdir -p /etc/ceph
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 079711a05..ba038bd61 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -10,27 +10,27 @@ MAINTAINER {{ maintainer }}
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
     {% set nova_libvirt_packages = [
-        'libvirt-daemon',
+        'ceph-common',
         'libguestfs',
-        'openvswitch',
-        'qemu-kvm',
-        'libvirt-daemon-driver-nwfilter',
+        'libvirt-daemon',
         'libvirt-daemon-config-nwfilter',
         'libvirt-daemon-driver-lxc',
-        'ceph-common'
+        'libvirt-daemon-driver-nwfilter',
+        'openvswitch',
+        'qemu-kvm'
     ] %}
 
 {% elif base_distro == 'ubuntu' %}
 
     {% set nova_libvirt_packages = [
         'ceph-common',
-        'libvirt-bin',
         'dmidecode',
+        'ebtables',
+        'libvirt-bin',
         'openvswitch-switch',
         'pm-utils',
         'qemu',
         'qemu-block-extra',
-        'ebtables',
         'xen-utils-4.6'
     ] %}
 
@@ -38,15 +38,15 @@ MAINTAINER {{ maintainer }}
 
     {% set nova_libvirt_packages = [
         'ceph-common',
-        'libvirt-bin',
         'dmidecode',
+        'ebtables',
+        'libvirt-bin',
         'openvswitch-switch',
         'pm-utils',
         'qemu',
         'qemu-block-extra',
-        'ebtables',
-        'xen-utils-4.4',
-        'usermode'
+        'usermode',
+        'xen-utils-4.4'
     ] %}
 
 {% endif %}
diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2
index c90fd6b7c..41319412c 100644
--- a/docker/nova/nova-placement-api/Dockerfile.j2
+++ b/docker/nova/nova-placement-api/Dockerfile.j2
@@ -10,8 +10,8 @@ MAINTAINER {{ maintainer }}
 
         {% set nova_placement_api_packages = [
             'httpd',
-            'mod_wsgi',
             'mod_ssl',
+            'mod_wsgi',
             'openstack-nova-placement-api'
         ] %}
 
@@ -36,8 +36,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf
 
         {% set nova_placement_api_packages = [
             'httpd',
-            'mod_wsgi',
-            'mod_ssl'
+            'mod_ssl',
+            'mod_wsgi'
         ] %}
 
 {{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index edd014dfa..69a412a0a 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -9,9 +9,9 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_spicehtml5proxy_packages = [
+            'numpy',
             'openstack-nova-spicehtml5proxy',
-            'spice-html5',
-            'numpy'
+            'spice-html5'
         ] %}
 
     {% elif base_distro in ['ubuntu'] %}
@@ -27,8 +27,8 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_spicehtml5proxy_packages = [
-            'spice-html5',
-            'numpy'
+            'numpy',
+            'spice-html5'
         ] %}
 
     {% elif base_distro in ['ubuntu'] %}