From ab8705269e199c5016feb013bb023cdfec35f772 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 12 May 2023 20:39:41 +0800 Subject: [PATCH] playbook/jobs/init_gitlab: update --- playbook/jobs/init_gitlab | 3 +++ playbook/roles/gitlab/templates/provider.yaml | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/playbook/jobs/init_gitlab b/playbook/jobs/init_gitlab index 5c6a9333..3b9d4efa 100644 --- a/playbook/jobs/init_gitlab +++ b/playbook/jobs/init_gitlab @@ -17,3 +17,6 @@ - secret_name: gitlab-tls keyfile: /etc/ssl/apollo-ev.com.key certfile: /etc/ssl/apollo-ev.com.pem + gitlab_oidc_client_id: gitlab_oidc + gitlab_oidc_isser: 'https://keycloak.apollo-ev.com/realms/cloud-sso' + gitlab_oidc_redirect_uri: 'https://gitlab.apollo-ev.com/users/auth/openid_connect/callback' diff --git a/playbook/roles/gitlab/templates/provider.yaml b/playbook/roles/gitlab/templates/provider.yaml index 7c61a007..e8026984 100644 --- a/playbook/roles/gitlab/templates/provider.yaml +++ b/playbook/roles/gitlab/templates/provider.yaml @@ -1,4 +1,4 @@ -name: 'openid_connect' +playbook/roles/gitlab/templates/provider.yamlname: 'openid_connect' label: 'keycloak-sso' args: name: 'openid_connect' @@ -11,8 +11,8 @@ args: response_type: 'code' client_auth_method: 'query' send_scope_to_token_endpoint: true - issuer: 'https://keycloak.onwalk.net/realms/cloud-sso' + issuer: '{{ gitlab_oidc_isser }}' client_options: - identifier: 'gitlab-oidc' - secret: '{{ gitlab_odic_client_token }}' - redirect_uri: 'https://gitlab.onwalk.net/users/auth/openid_connect/callback' + identifier: '{{ gitlab_oidc_client_id }}' + secret: '{{ gitlab_oidc_client_token }}' + redirect_uri: '{{ gitlab_oidc_redirect_uri }}'