From d967f400e2761e9022a6b2dedc2d307d32d1ea27 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 9 Mar 2022 11:48:20 +0000
Subject: 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 +++
 2 files changed, 11 insertions(+)

(limited to 'docker')

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 77e4d732a..0721a6509 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -10,6 +10,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',
@@ -56,6 +58,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'e2fsprogs',
             'genisoimage',
             'ironic-common',
+            'libsasl2-modules-gssapi-mit',
             'multipath-tools',
             'nfs-common',
             'nova-compute',
@@ -69,6 +72,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-rados',
             'python3-rbd',
             'python3-rtslib-fb',
+            'sasl2-bin',
             'sysfsutils',
             'targetcli-fb',
             'xfsprogs'
@@ -94,6 +98,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',
@@ -146,6 +152,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'e2fsprogs',
             'genisoimage',
             'libosinfo-bin',
+            'libsasl2-modules-gssapi-mit',
             'multipath-tools',
             'nfs-common',
             'open-iscsi',
@@ -157,6 +164,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 d18ec09bd..f2da51e4c 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -11,6 +11,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',
@@ -62,6 +63,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',
@@ -71,6 +73,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'python3-rbd',
         'qemu-block-extra',
         'qemu-system',
+        'sasl2-bin',
         'trousers'
     ] %}
 
-- 
cgit v1.2.3