aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-libvirt
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-03-23 20:06:50 +0000
committerEduardo Gonzalez <dabarren@gmail.com>2017-03-28 16:45:16 +0100
commit623e54da372563d068f0edf979b04996d70b306c (patch)
tree10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/nova/nova-libvirt
parentce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff)
downloadkolla-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-libvirt')
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j222
1 files changed, 11 insertions, 11 deletions
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 %}