openstack/kolla
Code Issues Proposed changes

Using qemu-kvm on rhel

Browse Source 
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
This commit is contained in:
Attila Fazekas 2018-08-03 17:08:45 +02:00 committed by Martin André
parent 695d4d603d
commit a917eb7166
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -34,9 +34,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ceph-common',
'lvm2',
'cryptsetup',
'qemu-img-ev'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% if base_distro in ['centos', 'oraclelinux'] %}
{% set cinder_base_packages = cinder_base_packages + [
'qemu-img-ev'
] %}
{% else %}
{% set cinder_base_packages = cinder_base_packages + [
'qemu-img'
] %}
{% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',

4
docker/glance/glance-api/Dockerfile.j2
View File

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

10
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -25,12 +25,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-scciclient',
'python-sushy',
'python-UcsSdk',
'qemu-img-ev',
'shellinabox',
'systemd-python',
'util-linux',
'xfsprogs',
] %}
{% if base_distro in ['centos', 'oraclelinux'] %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img-ev'
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img'
] %}
{% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
# ImcSdk package, python-sushy

10
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -19,8 +19,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libvirt-daemon-driver-lxc',
'libvirt-daemon-driver-nwfilter',
'openvswitch',
'qemu-kvm-ev'
] %}
{% if base_distro in ['centos', 'oraclelinux'] %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm-ev'
] %}
{% else %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm'
] %}
{% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %}