Skip to content

Commit 72537b4

Browse files
authored
Merge pull request #1464 from rackerlabs/alter-auth
chore: update mod_auth_openidc and use the ansible container by default to setup keystone
2 parents 91e6bb6 + 5012b8f commit 72537b4

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

components/images-openstack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ images:
55

66
tags:
77
# these are common across all these OpenStack Helm installations
8-
bootstrap: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
8+
bootstrap: "ghcr.io/rackerlabs/understack/ansible:latest"
99
db_init: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
1010
db_drop: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"
1111
ks_user: "quay.io/airshipit/heat:2025.2-ubuntu_jammy"

components/keystone/values.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
---
33
release_group: null
44

5-
images:
6-
tags:
7-
bootstrap: "ghcr.io/rackerlabs/understack/ansible:latest"
8-
95
bootstrap:
106
enabled: true
117
ks_user: admin
128
script: |
13-
ansible-runner run /runner --playbook keystone_bootstrap.yaml -vv
9+
ansible-runner run /runner --playbook keystone-post-deploy.yaml -vv
1410
1511
network:
1612
# configure OpenStack Helm to use Undercloud's ingress

containers/keystone/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
ARG OPENSTACK_VERSION="required_argument"
44
FROM quay.io/airshipit/keystone:${OPENSTACK_VERSION}-ubuntu_jammy
55

6-
ADD --checksum=sha256:deb52ea8304a41ee0331e4ba87a9f82ff643464b6d34084e161f58ec11c25a69 https://github.com/OpenIDC/mod_auth_openidc/releases/download/v2.4.16.5/libapache2-mod-auth-openidc_2.4.16.5-1.jammy_amd64.deb /tmp
6+
# renovate: datasource=github-releases depName=OpenIDC/mod_auth_openidc
7+
ARG MOD_AUTH_OPENIDC_VERSION=2.4.16.11
8+
ARG MOD_AUTH_OPENIDC_SHA256=f5b8751fe2dc7e249c8bf0f7b376cecf90427ba8ba280f18f850fc658047f091
9+
ADD --checksum=sha256:${MOD_AUTH_OPENIDC_SHA256} https://github.com/OpenIDC/mod_auth_openidc/releases/download/v${MOD_AUTH_OPENIDC_VERSION}/libapache2-mod-auth-openidc_${MOD_AUTH_OPENIDC_VERSION}-1.jammy_amd64.deb /tmp
710

811
RUN apt-get update && \
912
apt-get install -y --no-install-recommends \
10-
/tmp/libapache2-mod-auth-openidc_2.4.16.5-1.jammy_amd64.deb \
13+
/tmp/libapache2-mod-auth-openidc_${MOD_AUTH_OPENIDC_VERSION}-1.jammy_amd64.deb \
1114
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*.deb

0 commit comments

Comments
 (0)