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/glance | |
| 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/glance')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 23ec04d7b..200153f54 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 {% 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 %} |