Merge "libvirt: add Cyrus SASL packages for DIGEST-MD5"

This commit is contained in:
Zuul 2022-03-11 14:54:09 +00:00 committed by Gerrit Code Review
commit 61744a7bbf
3 changed files with 17 additions and 0 deletions

View File

@ -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'

View File

@ -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'
] %}

View File

@ -0,0 +1,6 @@
---
features:
- |
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256
mechanisms. These can be used for libvirt SASL authentication.
`LP#1964013 <https://bugs.launchpad.net/kolla-ansible/+bug/1964013>`__