From 1a75ca07ed117d4646e60257884331c34b059861 Mon Sep 17 00:00:00 2001 From: Marco Lettere Date: Tue, 17 Nov 2020 10:04:44 +0100 Subject: [PATCH] get realm from request instead of configuration --- .../roles/ansible-role-lr62-workflows/defaults/main.yaml | 6 +++--- .../templates/delete-user-account.json.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/ansible-role-lr62-workflows/defaults/main.yaml b/ansible/roles/ansible-role-lr62-workflows/defaults/main.yaml index dd1207e..b1ed55b 100644 --- a/ansible/roles/ansible-role-lr62-workflows/defaults/main.yaml +++ b/ansible/roles/ansible-role-lr62-workflows/defaults/main.yaml @@ -13,10 +13,10 @@ workflows: - user-group_deleted - user-group-role_deleted - delete-user-account -keycloak_realm: d4science +#keycloak_realm: d4science keycloak_host: "https://accounts.dev.d4science.org/auth" -keycloak: "{{ keycloak_host }}/realms/{{ keycloak_realm}}" -keycloak_admin: "{{ keycloak_host }}/admin/realms/{{ keycloak_realm }}" +keycloak: "{{ keycloak_host }}/realms" +keycloak_admin: "{{ keycloak_host }}/admin/realms" keycloak_auth: "c93501bd-abeb-4228-bc28-afac38877338" liferay: "https://next.d4science.org/api/jsonws" liferay_auth: "bm90aWZpY2F0aW9uc0BkNHNjaWVuY2Uub3JnOmdjdWJlcmFuZG9tMzIx" diff --git a/ansible/roles/ansible-role-lr62-workflows/templates/delete-user-account.json.j2 b/ansible/roles/ansible-role-lr62-workflows/templates/delete-user-account.json.j2 index b4c079a..8d1481a 100644 --- a/ansible/roles/ansible-role-lr62-workflows/templates/delete-user-account.json.j2 +++ b/ansible/roles/ansible-role-lr62-workflows/templates/delete-user-account.json.j2 @@ -12,8 +12,8 @@ "taskReferenceName": "init", "type": "LAMBDA", "inputParameters": { - "keycloak": "{{ keycloak }}", - "keycloak_admin" : "{{ keycloak_admin }}", + "keycloak": "{{ keycloak }}/${workflow.input.realm}", + "keycloak_admin" : "{{ keycloak_admin }}/${workflow.input.realm}", "liferay": "{{ liferay }}", "liferay_auth": "{{ liferay_auth }}", "keycloak_userid" : "${workflow.input.userid}",