Skip to content
Snippets Groups Projects
Verified Commit f7ee2f86 authored by Jaromír Hradil's avatar Jaromír Hradil
Browse files

Unifying variable naming convention

parent 914ccba2
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !22. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 38 additions and 39 deletions
cesnet-central/deployments/fullhub.yaml
+ 8
− 8
View file @ f7ee2f86
......@@ -192,15 +192,15 @@ hub:
- urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
claim_groups_key: "entitlements"
EGICheckinAuthenticator:
checkin_host: "{{ secret['checkin_host'] }}"
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
checkin_host: "{{ secrets[name]['checkin_host'] }}"
authorize_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secrets[name]['client_id'] }}"
client_secret: "{{ secrets[name]['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
openid_configuration_url: "https://{{ secret['checkin_host'] }}/.well-known/openid-configuration"
openid_configuration_url: "https://{{ secrets[name]['checkin_host'] }}/.well-known/openid-configuration"
scope: ["openid", "profile", "email", "offline_access", "entitlements"]
username_claim: "sub"
extra_authorize_params:
......
common/deployments/hub-production.yaml
+ 8
− 8
View file @ f7ee2f86
......@@ -173,15 +173,15 @@ hub:
- urn:geant:open-science-cloud.ec.europa.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
claim_groups_key: "entitlements"
EGICheckinAuthenticator:
checkin_host: "{{ secret['checkin_host'] }}"
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
checkin_host: "{{ secrets[name]['checkin_host'] }}"
authorize_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secrets[name]['client_id'] }}"
client_secret: "{{ secrets[name]['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
openid_configuration_url: "https://{{ secret['checkin_host'] }}/.well-known/openid-configuration"
openid_configuration_url: "https://{{ secrets[name]['checkin_host'] }}/.well-known/openid-configuration"
scope: ["openid", "profile", "email", "offline_access", "entitlements"]
username_claim: "sub"
extra_authorize_params:
......
common/deployments/hub-staging.yaml
+ 8
− 8
View file @ f7ee2f86
......@@ -173,15 +173,15 @@ hub:
- urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
claim_groups_key: "entitlements"
EGICheckinAuthenticator:
checkin_host: "{{ secret['checkin_host'] }}"
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
checkin_host: "{{ secrets[name][[name][[name]['checkin_host'] }}"
authorize_url: "https://{{ secrets[name][[name][[name]['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secrets[name][[name][[name]['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secrets[name][[name][[name]['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secrets[name][[name][[name]['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secrets[name][[name][[name]['client_id'] }}"
client_secret: "{{ secrets[name][[name][[name]['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
openid_configuration_url: "https://{{ secret['checkin_host'] }}/.well-known/openid-configuration"
openid_configuration_url: "https://{{ secrets[name][[name][[name]['checkin_host'] }}/.well-known/openid-configuration"
scope: ["openid", "profile", "email", "offline_access", "entitlements"]
username_claim: "sub"
extra_authorize_params:
......
common/playbooks/notebooks.yaml
+ 0
− 1
View file @ f7ee2f86
......@@ -25,7 +25,6 @@
- name: Copy config file to master
vars:
name: "{{ item | basename | splitext | first }}"
secret: "{{ secrets[name] }}"
template:
src: "{{ item }}"
dest: "/tmp/{{ item | basename }}"
......
common/playbooks/security-assets.yaml
+ 2
− 2
View file @ f7ee2f86
......@@ -18,11 +18,11 @@
tasks:
- name: Get Secrets From Vault
set_fact:
secret: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'), token_validate=false) }}"
secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'), token_validate=false) }}"
- name: Debug Secrets
debug:
msg: "{{ item.key }} = {{ item.value }}"
loop: "{{ secret | dict2items }}"
loop: "{{ secrets | dict2items }}"
- name: Directory for for GLPI agent configuration
file:
path: /etc/glpi-agent/conf.d
......
common/playbooks/security-scanner.yaml
+ 2
− 2
View file @ f7ee2f86
......@@ -18,11 +18,11 @@
when: "'deepfence' not in ansible_local.helm_repos | map(attribute='name') | list"
- name: Get Secrets From Vault
set_fact:
secret: "{{ lookup('community.hashi_vault.hashi_vault', [ vault_mount_point, 'site-' + site_name] | join('/'), token_validate=false) }}"
secrets: "{{ lookup('community.hashi_vault.hashi_vault', [ vault_mount_point, 'site-' + site_name] | join('/'), token_validate=false) }}"
- name: Debug Secrets
debug:
msg: "{{ item.key }} = {{ item.value }}"
loop: "{{ secret | dict2items }}"
loop: "{{ secrets | dict2items }}"
- name: Deepfence ThreadManager Agent Configuration
template:
src: templates/deepfence-agent.yaml.j2
......
common/playbooks/templates/deepfence-agent.yaml.j2
+ 2
− 2
View file @ f7ee2f86
managementConsoleUrl: "{{ secret['deepfence_host'] | default('') }}"
deepfenceKey: "{{ secret['deepfence_key'] | default('') }}"
managementConsoleUrl: "{{ secrets['deepfence_host'] | default('') }}"
deepfenceKey: "{{ secrets['deepfence_key'] | default('') }}"
clusterName: "jupyter-{{ site_name }}"
mountContainerRuntimeSocket:
containerSock: true
......
testing/deployments/hub.yaml
+ 8
− 8
View file @ f7ee2f86
......@@ -174,15 +174,15 @@ hub:
- urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
claim_groups_key: "entitlements"
EGICheckinAuthenticator:
checkin_host: "{{ secret['checkin_host'] }}"
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}"
checkin_host: "{{ secrets[name]['checkin_host'] }}"
authorize_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secrets[name]['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secrets[name]['client_id'] }}"
client_secret: "{{ secrets[name]['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
openid_configuration_url: "https://{{ secret['checkin_host'] }}/.well-known/openid-configuration"
openid_configuration_url: "https://{{ secrets[name]['checkin_host'] }}/.well-known/openid-configuration"
scope: ["openid", "profile", "email", "offline_access", "entitlements"]
username_claim: "sub"
extra_authorize_params:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment