diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 10 |
4 files changed, 31 insertions, 5 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', 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 %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 9a658fca5..36be871ec 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 '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 diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index f5de27817..f62fe90dc 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 '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'] %} |