Merge "Install libvirt-clients for nova-libvirt image"

1 files changed, 18 insertions, 27 deletions

diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index d3d7a2d20..edd4d506b 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -12,6 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set nova_libvirt_packages = [
         'ceph-common',
         'libguestfs',
+        'libvirt-client',
         'libvirt-daemon',
         'libvirt-daemon-config-nwfilter',
         'libvirt-daemon-driver-lxc',
@@ -20,58 +21,48 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'qemu-kvm'
     ] %}
 
-{% elif base_distro in ['ubuntu'] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
 
     {% set nova_libvirt_packages = [
         'ceph-common',
         'ebtables',
-        'libvirt-bin',
+        'libvirt-clients',
+        'libvirt-daemon-system',
         'openvswitch-switch',
         'pm-utils',
         'qemu',
         'qemu-block-extra'
     ] %}
 
-    {% if base_arch != "ppc64le" %}
-        {% set nova_libvirt_packages = nova_libvirt_packages + [
-            'dmidecode',
-            'xen-utils-4.6'
-        ] %}
-    {% endif %}
-
     {% if base_arch == "aarch64" %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
             'qemu-efi'
         ] %}
     {% endif %}
 
-{% elif base_distro in ['debian'] %}
-
-    {% set nova_libvirt_packages = [
-        'ceph-common',
-        'ebtables',
-        'libvirt-clients',
-        'libvirt-daemon-system',
-        'openvswitch-switch',
-        'pm-utils',
-        'qemu',
-        'qemu-block-extra',
-        'usermode'
-    ] %}
-
     {% if base_arch != "ppc64le" %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
             'dmidecode',
-            'xen-utils-4.8'
+            'xen-utils-4.6'
         ] %}
     {% endif %}
 
-    {% if base_arch == "aarch64" %}
+    {% if base_distro in ['debian'] %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
-            'qemu-efi'
+            'usermode'
         ] %}
+        {% if base_arch != "ppc64le" %}
+            {% set nova_libvirt_packages = nova_libvirt_packages + [
+                'xen-utils-4.8'
+            ] %}
+        {% endif %}
+    {% elif base_distro in ['ubuntu'] %}
+        {% if base_arch != "ppc64le" %}
+            {% set nova_libvirt_packages = nova_libvirt_packages + [
+                'xen-utils-4.6'
+            ] %}
+        {% endif %}
     {% endif %}
-
 {% endif %}
 
 {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}