diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:25:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-05-06 07:00:42 +0000 |
| commit | 610eef2089c186c6e698bb1781501ee8c696f7d5 (patch) | |
| tree | 9adad05e1544ef7dceaf056bd5dbb97c39765952 /docker/keystone | |
| parent | 33c0e26e8a0290f0b6d647bb67e18a4f500907fc (diff) | |
| download | kolla-610eef2089c186c6e698bb1781501ee8c696f7d5.tar.gz kolla-610eef2089c186c6e698bb1781501ee8c696f7d5.zip | |
Drop apache installation outside of httpd container22.0.0.0rc1
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986483
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986352
Change-Id: Ia66dde09bbbad2a5a9e67a8c642f3223ca38be43
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index e1e8588bf..36d793a2e 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -16,15 +16,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set keystone_base_packages = [ 'cyrus-sasl-devel', - 'mod_auth_mellon', - 'mod_auth_openidc', 'openldap-devel', ] %} {% elif base_package_type == 'deb' %} {% set keystone_base_packages = [ - 'libapache2-mod-auth-mellon', - 'libapache2-mod-auth-openidc', 'libldap-common', 'libldap2-dev', 'libsasl2-dev', diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 26af6932e..46d60330e 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -10,11 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set keystone_packages = [ 'krb5-devel', - 'mod_auth_gssapi', ] %} {% elif base_package_type == 'deb' %} {% set keystone_packages = [ - 'libapache2-mod-auth-gssapi', 'libkrb5-dev', ] %} {% endif %} |