diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-17 11:54:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-17 11:54:34 +0000 |
| commit | 5d2dfc0eb9fac7d22a04665173fe650b61985d19 (patch) | |
| tree | 8962ae2c35df1ae753ccaa14e1084e73e02dda66 /docker/keystone | |
| parent | ba2b4bb56415b9bd7b690dcf077bb59cf4083f05 (diff) | |
| parent | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (diff) | |
| download | kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.tar.gz kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.zip | |
Merge "Move to CentOS Stream 10"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/extend_start.sh | 3 |
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 |