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

FPDC: Add COREAPI_URL config value and use the env_suffix variable

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-11-26 15:29:33 +01:00
parent 4c90bbd592
commit 4ba4610a34
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/openshift-apps/fpdc/templates/configmap.yml
View file

@ -8,25 +8,22 @@ metadata:
data: data:
config.json: |- 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' %} {% if env == 'staging' %}
"SECRET_KEY": "{{ stg_fpdc_secret_key }}", "SECRET_KEY": "{{ stg_fpdc_secret_key }}",
"DB_PASSWORD": "{{ fpdc_stg_db_pass }}", "DB_PASSWORD": "{{ fpdc_stg_db_pass }}",
"DB_HOST": "{{ fpdc_stg_db_server }}", "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_ID": "{{ fpdc_stg_client_id }}",
"OIDC_RP_CLIENT_SECRET": "{{ fpdc_stg_client_secret }}", "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"
{% else %} {% else %}
"SECRET_KEY": "{{ fpdc_secret_key }}", "SECRET_KEY": "{{ fpdc_secret_key }}",
"DB_PASSWORD": "{{ fpdc_db_pass }}", "DB_PASSWORD": "{{ fpdc_db_pass }}",
"DB_HOST": "{{ fpdc_db_server }}", "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_ID": "{{ fpdc_client_id }}",
"OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}", "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"
{% endif %} {% endif %}
} }