diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-11 14:54:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-11 14:54:09 +0000 |
| commit | 61744a7bbf3283b83aee635e07ea482690df0405 (patch) | |
| tree | 3433f10b49d15966bbd169b8b6db89ddd75d41d6 /docker/nova | |
| parent | 5bb6489922aab2b431be8f121465eb7f3a49b5ae (diff) | |
| parent | e1efa9d257c45e5f99364974ea66a6d6ba5a5605 (diff) | |
| download | kolla-61744a7bbf3283b83aee635e07ea482690df0405.tar.gz kolla-61744a7bbf3283b83aee635e07ea482690df0405.zip | |
Merge "libvirt: add Cyrus SASL packages for DIGEST-MD5"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index a02732489..9996afd0f 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -14,6 +14,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_compute_packages = [ 'ceph-common', + 'cyrus-sasl-md5', + 'cyrus-sasl-scram', 'device-mapper-multipath', 'e2fsprogs', 'genisoimage', @@ -50,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'genisoimage', 'ironic-common', + 'libsasl2-modules-gssapi-mit', 'multipath-tools', 'nfs-common', 'nova-compute', @@ -65,6 +68,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rados', 'python3-rbd', 'python3-rtslib-fb', + 'sasl2-bin', 'sysfsutils', 'targetcli-fb', 'xfsprogs' @@ -88,6 +92,8 @@ RUN rm -f /etc/nova/nova-compute.conf {% set nova_compute_packages = [ 'ceph-common', + 'cyrus-sasl-md5', + 'cyrus-sasl-scram', 'device-mapper-multipath', 'dosfstools', 'e2fsprogs', @@ -127,6 +133,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'e2fsprogs', 'genisoimage', 'libosinfo-bin', + 'libsasl2-modules-gssapi-mit', 'multipath-tools', 'ndctl', 'nfs-common', @@ -141,6 +148,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'python3-rbd', 'python3-rtslib-fb', 'qemu-utils', + 'sasl2-bin', 'sysfsutils', 'targetcli-fb', 'xfsprogs' diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index e6da29880..db3a43885 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = [ 'ceph-common', + 'cyrus-sasl-md5', 'cyrus-sasl-scram', 'libguestfs', 'libvirt-client', @@ -41,6 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = [ 'ceph-common', 'ebtables', + 'libsasl2-modules-gssapi-mit', 'libvirt-clients', 'libvirt-daemon-system', 'openvswitch-switch', @@ -51,6 +53,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-block-extra', 'qemu-system', 'qemu-utils', + 'sasl2-bin', 'trousers' ] %} |