diff options
| author | Attila Fazekas <afazekas@redhat.com> | 2018-08-03 17:08:45 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2018-08-06 10:00:09 +0000 |
| commit | a917eb7166fcec88c64c4e6d6f8018c967a9940e (patch) | |
| tree | 0352e8bc271f151456b8298be25b8e07cc6cd4c9 /docker/cinder | |
| parent | 695d4d603d4b14a3a97b93bcfde5fb077f8b1900 (diff) | |
| download | kolla-a917eb7166fcec88c64c4e6d6f8018c967a9940e.tar.gz kolla-a917eb7166fcec88c64c4e6d6f8018c967a9940e.zip | |
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
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 8fb1bc5f1..ab3109b6b 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 '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', |