aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-05-20 09:21:59 +0000
committerMichal Nasiadka <mnasiadka@gmail.com>2025-07-16 14:05:50 +0000
commit9e36b8976657e5aaf285f4ab9f65603ab475fd89 (patch)
tree7d7f24ee6412f50116a9684bd09e0bbba7ba867e /docker/keystone
parenta90a8893c8df1eed8d8409c70bd8177392290554 (diff)
downloadkolla-9e36b8976657e5aaf285f4ab9f65603ab475fd89.tar.gz
kolla-9e36b8976657e5aaf285f4ab9f65603ab475fd89.zip
Move to CentOS Stream 10
Known missing packages: - mod_auth_mellon - missing SAML support in Keystone/Horizon - built in Kolla COPR - glusterfs-fuse in manila-share - built in Kolla COPR - collectd/telegraf - no opstools repository - redis - needs a switch to valkey - python3-ethtool - not required for neutron-mlnx-agent since 6 years [1] Building packages in Kolla COPR is a temporary solution until these show up in EPEL10. [1]: Id2cae3ac9ff049e9fc8225551f99e1e99a87fc65 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/951751 Change-Id: I7074fabcf95184fcfd2561648ae1e05acfb0bc11 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/keystone')
-rw-r--r--docker/keystone/keystone-base/Dockerfile.j23
-rw-r--r--docker/keystone/keystone-ssh/extend_start.sh3
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 7764accbd..8996a8e75 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -7,6 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
+{# NOTE(mnasiadka): mod_auth_mellon missing in CentOS 10 Stream - temporarily from Kolla COPR #}
+{{ macros.enable_extra_repos(['epel', 'kolla_el10']) }}
+
{{ macros.configure_user(name='keystone') }}
{% if base_package_type == 'rpm' %}
diff --git a/docker/keystone/keystone-ssh/extend_start.sh b/docker/keystone/keystone-ssh/extend_start.sh
index dc8f04b49..559cd65a9 100644
--- a/docker/keystone/keystone-ssh/extend_start.sh
+++ b/docker/keystone/keystone-ssh/extend_start.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-SSH_HOST_KEY_TYPES=( "rsa" "dsa" "ecdsa" "ed25519" )
+# NOTE(mnasiadka): CentOS 10 does not support dsa
+SSH_HOST_KEY_TYPES=( "rsa" "ecdsa" "ed25519" )
for key_type in ${SSH_HOST_KEY_TYPES[@]}; do
KEY_PATH=/etc/ssh/ssh_host_${key_type}_key