diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-23 20:06:50 +0000 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-03-28 16:45:16 +0100 |
| commit | 623e54da372563d068f0edf979b04996d70b306c (patch) | |
| tree | 10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/nova/nova-base | |
| parent | ce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff) | |
| download | kolla-623e54da372563d068f0edf979b04996d70b306c.tar.gz kolla-623e54da372563d068f0edf979b04996d70b306c.zip | |
Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.
Change-Id: I906ed89c10b12886665618752f525ba71d83d991
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 24 |
1 files changed, 12 insertions, 12 deletions
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 %} |