Alphabetize packages

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

Change-Id: I906ed89c10b12886665618752f525ba71d83d991

3 files changed, 33 insertions, 33 deletions

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ef309421c..0e35fc417 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -11,23 +11,23 @@ MAINTAINER {{ maintainer }}
         # python-seamicroclient, pyremotevbox package
         {% set ironic_conductor_packages = [
             'dosfstools',
-            'util-linux',
-            'openstack-ironic-conductor',
-            'qemu-img',
+            'gdisk',
             'ipmitool',
+            'openstack-ironic-conductor',
+            'openwsman-python',
             'parted',
-            'gdisk',
             'psmisc',
+            'pysnmp',
+            'python2-ImcSdk',
             'python-dracclient',
-            'python-proliantutils',
             'python-ironic-inspector-client',
+            'python-proliantutils',
             'python-pyghmi',
-            'pysnmp',
             'python-UcsSdk',
-            'openwsman-python',
-            'python2-ImcSdk',
+            'qemu-img',
             'shellinabox',
-            'socat'
+            'socat',
+            'util-linux'
         ] %}
     {% elif base_distro in ['ubuntu'] %}
         # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
@@ -35,19 +35,19 @@ MAINTAINER {{ maintainer }}
         {% set ironic_conductor_packages = [
             'bsdmainutils',
             'dosfstools',
-            'ironic-conductor',
-            'qemu-utils',
-            'ipmitool',
             'gdisk',
-            'psmisc',
+            'ipmitool',
+            'ironic-conductor',
             'parted',
-            'python-proliantutils',
+            'psmisc',
             'python-ironic-inspector-client',
+            'python-openwsman',
+            'python-proliantutils',
             'python-pyghmi',
             'python-pysnmp4',
             'python-scciclient',
             'python-seamicroclient',
-            'python-openwsman',
+            'qemu-utils',
             'shellinabox',
             'socat'
         ] %}
@@ -56,25 +56,25 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set ironic_conductor_packages = [
             'dosfstools',
-            'util-linux',
-            'qemu-img',
+            'fuse',
+            'gdisk',
             'ipmitool',
             'parted',
-            'gdisk',
             'psmisc',
-            'fuse',
+            'qemu-img',
             'shellinabox',
-            'socat'
+            'socat',
+            'util-linux'
         ] %}
     {% elif base_distro in ['ubuntu', 'debian'] %}
         {% set ironic_conductor_packages = [
             'bsdmainutils',
             'dosfstools',
-            'qemu-utils',
-            'ipmitool',
             'gdisk',
-            'psmisc',
+            'ipmitool',
             'parted',
+            'psmisc',
+            'qemu-utils',
             'shellinabox',
             'socat'
         ] %}
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
index 8adf9dfe7..4b8f75350 100644
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic/ironic-inspector/Dockerfile.j2
@@ -10,8 +10,8 @@ MAINTAINER {{ maintainer }}
         {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
     {% elif base_distro in ['ubuntu'] %}
         {% set ironic_inspector_packages = [
-            'ironic-inspector',
-            'iptables'
+            'iptables',
+            'ironic-inspector'
         ] %}
     {% endif %}
 
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 79e71393d..577200392 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -7,25 +7,25 @@ MAINTAINER {{ maintainer }}
 
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
     {% set ironic_pxe_packages = [
-        'tftp-server',
-        'syslinux-tftpboot',
         'httpd',
         'ipxe-bootimgs',
+        'mod_ssl',
         'mod_wsgi',
-        'mod_ssl'
+        'syslinux-tftpboot',
+        'tftp-server'
     ] %}
 {{ macros.install_packages(ironic_pxe_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', 'debian'] %}
     {% set ironic_pxe_packages = [
-        'tftpd-hpa',
-        'syslinux-common',
-        'syslinux',
-        'pxelinux',
         'apache2',
         'ipxe',
-        'libapache2-mod-wsgi'
+        'libapache2-mod-wsgi',
+        'pxelinux',
+        'syslinux',
+        'syslinux-common',
+        'tftpd-hpa'
     ] %}
 {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
 RUN echo > /etc/apache2/ports.conf