diff options
| author | Mark Goddard <mark@stackhpc.com> | 2022-03-21 11:44:38 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2022-03-21 12:00:10 +0000 |
| commit | 5cc480a617c68ed20c80bffec16321a937f5a32b (patch) | |
| tree | 0403fba8cbd93c282111bdbe691e2b3a3cd816b6 /docker | |
| parent | 0312ee67ee9f7e82afdad7ad361d72dfcd425dc6 (diff) | |
| download | kolla-5cc480a617c68ed20c80bffec16321a937f5a32b.tar.gz kolla-5cc480a617c68ed20c80bffec16321a937f5a32b.zip | |
masakari: add Cyrus SASL packages to monitors image
Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256
mechanisms. These can be used for libvirt SASL authentication.
Follow up to I13e19ca29eeab40cd08fa3afe2cdf7531867f81b.
Partial-Bug: #1964013
Change-Id: Ic4b6171789c3d360317599310492771bd78828ec
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/masakari/masakari-monitors/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 62da6fcfe..0a9c2d173 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -20,10 +20,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set masakari_base_packages = [ + 'libsasl2-modules-gssapi-mit', 'masakari-host-monitor', 'masakari-instance-monitor', 'masakari-introspective-instance-monitor', 'masakari-process-monitor', + 'sasl2-bin', ] %} {% endif %} @@ -35,6 +37,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set masakari_monitors_packages = [ + 'cyrus-sasl-md5', + 'cyrus-sasl-scram', 'python3-libvirt', 'pacemaker-cli', 'tcpdump', @@ -43,8 +47,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set masakari_monitors_packages = [ + 'libsasl2-modules-gssapi-mit', 'python3-libvirt', 'pacemaker-cli-utils', + 'sasl2-bin', 'tcpdump', ] %} |