From 4ba4610a34df1ddab1f5775210bb7459b10fc3c1 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 26 Nov 2018 15:29:33 +0100 Subject: [PATCH] FPDC: Add COREAPI_URL config value and use the env_suffix variable Signed-off-by: Clement Verna --- .../openshift-apps/fpdc/templates/configmap.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/roles/openshift-apps/fpdc/templates/configmap.yml b/roles/openshift-apps/fpdc/templates/configmap.yml index e9f172bda4..329fae6bae 100644 --- a/roles/openshift-apps/fpdc/templates/configmap.yml +++ b/roles/openshift-apps/fpdc/templates/configmap.yml @@ -8,25 +8,22 @@ metadata: data: config.json: |- { + "COREAPI_URL": "https://fpdc{{ env_suffix }}.fedoraproject.org", + "OIDC_OP_JWKS_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Jwks", + "OIDC_OP_AUTHORIZATION_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Authorization", + "OIDC_OP_TOKEN_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Token", + "OIDC_OP_USER_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/UserInfo", {% if env == 'staging' %} "SECRET_KEY": "{{ stg_fpdc_secret_key }}", "DB_PASSWORD": "{{ fpdc_stg_db_pass }}", "DB_HOST": "{{ fpdc_stg_db_server }}", - "OIDC_OP_JWKS_ENDPOINT": "https://id.stg.fedoraproject.org/openidc/Jwks", "OIDC_RP_CLIENT_ID": "{{ fpdc_stg_client_id }}", - "OIDC_RP_CLIENT_SECRET": "{{ fpdc_stg_client_secret }}", - "OIDC_OP_AUTHORIZATION_ENDPOINT": "https://id.stg.fedoraproject.org/openidc/Authorization", - "OIDC_OP_TOKEN_ENDPOINT": "https://id.stg.fedoraproject.org/openidc/Token", - "OIDC_OP_USER_ENDPOINT": "https://id.stg.fedoraproject.org/openidc/UserInfo" + "OIDC_RP_CLIENT_SECRET": "{{ fpdc_stg_client_secret }}" {% else %} "SECRET_KEY": "{{ fpdc_secret_key }}", "DB_PASSWORD": "{{ fpdc_db_pass }}", "DB_HOST": "{{ fpdc_db_server }}", - "OIDC_OP_JWKS_ENDPOINT": "https://id.fedoraproject.org/openidc/Jwks", "OIDC_RP_CLIENT_ID": "{{ fpdc_client_id }}", - "OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}", - "OIDC_OP_AUTHORIZATION_ENDPOINT": "https://id.fedoraproject.org/openidc/Authorization", - "OIDC_OP_TOKEN_ENDPOINT": "https://id.fedoraproject.org/openidc/Token", - "OIDC_OP_USER_ENDPOINT": "https://id.fedoraproject.org/openidc/UserInfo" + "OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}" {% endif %} }