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-libvirt | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 22 |
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 %} |