diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/nova/nova-base | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
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 %} |