Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

elections: try and adjust for new flask-oidc

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-12-11 16:54:34 -08:00
parent 24aaee6429
commit cd4cf0596c
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
playbooks/openshift-apps/elections.yml
View file

@ -25,6 +25,9 @@
hosts: os_control_stg[0]:os_control[0] hosts: os_control_stg[0]:os_control[0]
user: root user: root
gather_facts: false gather_facts: false
vars:
elections_oidc_overwrite_redirect_uri: >-
https://elections{{ env_suffix }}.fedoraproject.org/oidc_callback
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

4
roles/openshift-apps/elections/templates/client_secrets.json
View file

@ -8,8 +8,8 @@
"client_secret": "{{ elections_oidc_client_secret }}", "client_secret": "{{ elections_oidc_client_secret }}",
{% endif %} {% endif %}
"issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/", "issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/",
"redirect_uris": [ "redirect_uris": ["{{ elections_oidc_overwrite_redirect_uri }}"],
"https://elections{{env_suffix}}.fedoraproject.org/oidc_callback"
], ],
"token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", "token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token",
"userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo" "userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo"

1
roles/openshift-apps/elections/templates/fedora-elections.cfg
View file

@ -21,6 +21,7 @@ FEDORA_ELECTIONS_ADMIN_GROUP = 'elections'
OIDC_CLIENT_SECRETS = '/opt/app-root/secret/client_secrets.json' OIDC_CLIENT_SECRETS = '/opt/app-root/secret/client_secrets.json'
OIDC_OVERWRITE_REDIRECT_URI = '{{ elections_oidc_overwrite_redirect_uri }}'
## Fedora-elections can integrate with FAS to retrieve information about the ## Fedora-elections can integrate with FAS to retrieve information about the
## candidates, the following configuration keys are required for this ## candidates, the following configuration keys are required for this