Browse Source

Using qemu-kvm on rhel

qemu-kvm-ev was used with centos,
in case of rhel when you have
access to the virtualisation related channels qemu-kvm pulls
qemu-kvm-rhev which is the recommended one.

qemu-kvm-ev was referenced by devstack long time ago,
but the explicit package install on rhel family today
is qemu-kvm and not qemu-kvm-ev.

I am unsure about the other distros, so just changing rhel.

Change-Id: If6d1e0367730fa80284395be33674a7cd1465389
tags/7.0.0.0rc1
Attila Fazekas 9 months ago
parent
commit
a917eb7166

+ 10
- 2
docker/cinder/cinder-base/Dockerfile.j2 View File

@@ -34,9 +34,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
34 34
                 'ceph-common',
35 35
                 'lvm2',
36 36
                 'cryptsetup',
37
-                'qemu-img-ev'
38 37
         ] %}
39
-     {% elif base_distro in ['debian', 'ubuntu'] %}
38
+        {% if base_distro in ['centos', 'oraclelinux'] %}
39
+            {% set cinder_base_packages = cinder_base_packages + [
40
+                'qemu-img-ev'
41
+            ] %}
42
+        {% else %}
43
+            {% set cinder_base_packages = cinder_base_packages + [
44
+                 'qemu-img'
45
+            ] %}
46
+        {% endif %}
47
+    {% elif base_distro in ['debian', 'ubuntu'] %}
40 48
         {% set cinder_base_packages = [
41 49
                 'ceph-common',
42 50
                 'lvm2',

+ 3
- 1
docker/glance/glance-api/Dockerfile.j2 View File

@@ -5,8 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5 5
 
6 6
 {% import "macros.j2" as macros with context %}
7 7
 
8
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
8
+{% if base_distro in ['centos', 'oraclelinux'] %}
9 9
     {% set glance_api_packages = ['qemu-img-ev'] %}
10
+{% elif base_distro == 'rhel' %}
11
+    {% set glance_api_packages = ['qemu-img'] %}
10 12
 {% elif base_distro in ['debian', 'ubuntu'] %}
11 13
     {% set glance_api_packages = ['qemu-utils'] %}
12 14
 {% endif %}

+ 9
- 1
docker/ironic/ironic-conductor/Dockerfile.j2 View File

@@ -25,12 +25,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
25 25
             'python-scciclient',
26 26
             'python-sushy',
27 27
             'python-UcsSdk',
28
-            'qemu-img-ev',
29 28
             'shellinabox',
30 29
             'systemd-python',
31 30
             'util-linux',
32 31
             'xfsprogs',
33 32
         ] %}
33
+        {% if base_distro in ['centos', 'oraclelinux'] %}
34
+            {% set ironic_conductor_packages = ironic_conductor_packages + [
35
+                'qemu-img-ev'
36
+            ] %}
37
+        {% else %}
38
+            {% set ironic_conductor_packages = ironic_conductor_packages + [
39
+                'qemu-img'
40
+            ] %}
41
+        {% endif %}
34 42
     {% elif base_distro in ['debian', 'ubuntu'] %}
35 43
         # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
36 44
         # ImcSdk package, python-sushy

+ 9
- 1
docker/nova/nova-libvirt/Dockerfile.j2 View File

@@ -19,8 +19,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
19 19
         'libvirt-daemon-driver-lxc',
20 20
         'libvirt-daemon-driver-nwfilter',
21 21
         'openvswitch',
22
-        'qemu-kvm-ev'
23 22
     ] %}
23
+    {% if base_distro in ['centos', 'oraclelinux'] %}
24
+        {% set nova_libvirt_packages = nova_libvirt_packages + [
25
+            'qemu-kvm-ev'
26
+        ] %}
27
+    {% else %}
28
+        {% set nova_libvirt_packages = nova_libvirt_packages + [
29
+            'qemu-kvm'
30
+        ] %}
31
+    {% endif %}
24 32
 
25 33
 {% elif base_distro in ['debian', 'ubuntu'] %}
26 34
 

Loading…
Cancel
Save