From 292e78312a75dc7cb7c060d138eec7d34918d295 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 9 Mar 2022 11:48:20 +0000
Subject: [PATCH] libvirt: add Cyrus SASL packages for DIGEST-MD5

Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256
mechanisms. These can be used for libvirt SASL authentication.

Change-Id: I13e19ca29eeab40cd08fa3afe2cdf7531867f81b
Partial-Bug: #1964013
(cherry picked from commit e1efa9d257c45e5f99364974ea66a6d6ba5a5605)
---
 docker/nova/nova-compute/Dockerfile.j2                | 8 ++++++++
 docker/nova/nova-libvirt/Dockerfile.j2                | 3 +++
 releasenotes/notes/libvirt-sasl-07a8a1a25d2450c6.yaml | 6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/libvirt-sasl-07a8a1a25d2450c6.yaml

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 8c0df7fd4d..6a10e66272 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',
             'nfs-common',
             'nvme-cli',
@@ -140,6 +147,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 e6da29880c..db3a43885f 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'
     ] %}
 
diff --git a/releasenotes/notes/libvirt-sasl-07a8a1a25d2450c6.yaml b/releasenotes/notes/libvirt-sasl-07a8a1a25d2450c6.yaml
new file mode 100644
index 0000000000..e88bc0d922
--- /dev/null
+++ b/releasenotes/notes/libvirt-sasl-07a8a1a25d2450c6.yaml
@@ -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>`__