summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Fazekas <afazekas@redhat.com>2018-08-03 17:08:45 +0200
committerMartin André <m.andre@redhat.com>2018-08-06 10:00:09 +0000
commita917eb7166fcec88c64c4e6d6f8018c967a9940e (patch)
tree0352e8bc271f151456b8298be25b8e07cc6cd4c9
parent695d4d603d4b14a3a97b93bcfde5fb077f8b1900 (diff)
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
Notes
Notes (review): Code-Review+2: Martin André <m.andre@redhat.com> Code-Review+1: Liping Mao <limao@cisco.com> Code-Review+2: Jeffrey Zhang <zhang.lei.fly@gmail.com> Workflow+1: Jeffrey Zhang <zhang.lei.fly@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 07 Aug 2018 08:38:54 +0000 Reviewed-on: https://review.openstack.org/588595 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j212
-rw-r--r--docker/glance/glance-api/Dockerfile.j24
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j210
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j210
4 files changed, 31 insertions, 5 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 8fb1bc5..ab3109b 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -34,9 +34,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
34 'ceph-common', 34 'ceph-common',
35 'lvm2', 35 'lvm2',
36 'cryptsetup', 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 {% set cinder_base_packages = [ 48 {% set cinder_base_packages = [
41 'ceph-common', 49 'ceph-common',
42 'lvm2', 50 'lvm2',
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 23ec04d..200153f 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -5,8 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5 5
6{% import "macros.j2" as macros with context %} 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 {% set glance_api_packages = ['qemu-img-ev'] %} 9 {% set glance_api_packages = ['qemu-img-ev'] %}
10{% elif base_distro == 'rhel' %}
11 {% set glance_api_packages = ['qemu-img'] %}
10{% elif base_distro in ['debian', 'ubuntu'] %} 12{% elif base_distro in ['debian', 'ubuntu'] %}
11 {% set glance_api_packages = ['qemu-utils'] %} 13 {% set glance_api_packages = ['qemu-utils'] %}
12{% endif %} 14{% endif %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 9a658fc..36be871 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -25,12 +25,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
25 'python-scciclient', 25 'python-scciclient',
26 'python-sushy', 26 'python-sushy',
27 'python-UcsSdk', 27 'python-UcsSdk',
28 'qemu-img-ev',
29 'shellinabox', 28 'shellinabox',
30 'systemd-python', 29 'systemd-python',
31 'util-linux', 30 'util-linux',
32 'xfsprogs', 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 {% elif base_distro in ['debian', 'ubuntu'] %} 42 {% elif base_distro in ['debian', 'ubuntu'] %}
35 # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, 43 # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
36 # ImcSdk package, python-sushy 44 # ImcSdk package, python-sushy
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index f5de278..f62fe90 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -19,8 +19,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
19 'libvirt-daemon-driver-lxc', 19 'libvirt-daemon-driver-lxc',
20 'libvirt-daemon-driver-nwfilter', 20 'libvirt-daemon-driver-nwfilter',
21 'openvswitch', 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{% elif base_distro in ['debian', 'ubuntu'] %} 33{% elif base_distro in ['debian', 'ubuntu'] %}
26 34