Skip to content

Commit ca49527

Browse files
committed
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 e1efa9d)
1 parent 61f1705 commit ca49527

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

docker/nova/nova-compute/Dockerfile.j2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1414

1515
{% set nova_compute_packages = [
1616
'ceph-common',
17+
'cyrus-sasl-md5',
18+
'cyrus-sasl-scram',
1719
'device-mapper-multipath',
1820
'e2fsprogs',
1921
'genisoimage',
@@ -50,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5052
'e2fsprogs',
5153
'genisoimage',
5254
'ironic-common',
55+
'libsasl2-modules-gssapi-mit',
5356
'multipath-tools',
5457
'nfs-common',
5558
'nova-compute',
@@ -65,6 +68,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6568
'python3-rados',
6669
'python3-rbd',
6770
'python3-rtslib-fb',
71+
'sasl2-bin',
6872
'sysfsutils',
6973
'targetcli-fb',
7074
'xfsprogs'
@@ -88,6 +92,8 @@ RUN rm -f /etc/nova/nova-compute.conf
8892

8993
{% set nova_compute_packages = [
9094
'ceph-common',
95+
'cyrus-sasl-md5',
96+
'cyrus-sasl-scram',
9197
'device-mapper-multipath',
9298
'dosfstools',
9399
'e2fsprogs',
@@ -127,6 +133,7 @@ RUN rm -f /etc/nova/nova-compute.conf
127133
'e2fsprogs',
128134
'genisoimage',
129135
'libosinfo-bin',
136+
'libsasl2-modules-gssapi-mit',
130137
'multipath-tools',
131138
'nfs-common',
132139
'nvme-cli',
@@ -140,6 +147,7 @@ RUN rm -f /etc/nova/nova-compute.conf
140147
'python3-rbd',
141148
'python3-rtslib-fb',
142149
'qemu-utils',
150+
'sasl2-bin',
143151
'sysfsutils',
144152
'targetcli-fb',
145153
'xfsprogs'

docker/nova/nova-libvirt/Dockerfile.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1515

1616
{% set nova_libvirt_packages = [
1717
'ceph-common',
18+
'cyrus-sasl-md5',
1819
'cyrus-sasl-scram',
1920
'libguestfs',
2021
'libvirt-client',
@@ -40,6 +41,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
4041
{% set nova_libvirt_packages = [
4142
'ceph-common',
4243
'ebtables',
44+
'libsasl2-modules-gssapi-mit',
4345
'libvirt-clients',
4446
'libvirt-daemon-system',
4547
'openvswitch-switch',
@@ -49,6 +51,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
4951
'python3-rbd',
5052
'qemu-block-extra',
5153
'qemu-system',
54+
'sasl2-bin',
5255
'trousers'
5356
] %}
5457

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256
5+
mechanisms. These can be used for libvirt SASL authentication.
6+
`LP#1964013 <https://bugs.launchpad.net/kolla-ansible/+bug/1964013>`__

0 commit comments

Comments
 (0)