diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-05-08 07:55:29 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-06-01 12:28:07 +0000 |
| commit | 7f277e1c0384ceaf7526ce261ab0bde8977a86fd (patch) | |
| tree | 7e97c154d7816943923f404599fc84ea6dae08f3 | |
| parent | 83b8161b12bb1a32b8b872c46533cfa6a2fe9d7f (diff) | |
| download | kolla-7f277e1c0384ceaf7526ce261ab0bde8977a86fd.tar.gz kolla-7f277e1c0384ceaf7526ce261ab0bde8977a86fd.zip | |
httpd: Install mod_auth_mellon from EPEL
And remove the redundant comment and repo enablement in keystone
container.
Change-Id: I3a64b13fcaef62c73cccc9c478e7392efc8ee554
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
| -rw-r--r-- | docker/httpd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2 index 03b4e688b..98f012f2a 100644 --- a/docker/httpd/Dockerfile.j2 +++ b/docker/httpd/Dockerfile.j2 @@ -8,8 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if base_package_type == 'rpm' %} -{# NOTE(mnasiadka): mod_auth_mellon missing in CentOS 10 Stream - temporarily from Kolla COPR #} -{{ macros.enable_extra_repos(['epel', 'kolla_el10']) }} +{{ macros.enable_extra_repos(['epel']) }} {% set apache_packages = [ 'httpd', 'mod_ssl', diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 36d793a2e..47b37983c 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -11,8 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} -{# NOTE(mnasiadka): mod_auth_mellon missing in CentOS 10 Stream - temporarily from Kolla COPR #} -{{ macros.enable_extra_repos(['epel', 'kolla_el10']) }} +{{ macros.enable_extra_repos(['epel']) }} {% set keystone_base_packages = [ 'cyrus-sasl-devel', diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 92402bcdd..f23c18eed 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -140,10 +140,6 @@ rpm: hacluster: name: "highavailability" distro: true - kolla_el10: - baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/" - gpgkey: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/pubkey.gpg" - name: "kolla_el10" mariadb: baseurl: "https://dlm.mariadb.com/repo/mariadb-server/11.4/yum/rhel/$releasever/$basearch" gpgkey: "https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB" |