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

fpdc: separate config files

Browse source 
Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2019-06-11 16:30:51 +02:00
parent 87fb44edde
commit 65876c4d0d
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
roles/openshift-apps/fpdc/templates/config.json Normal file
View file

@ -0,0 +1,21 @@
{
"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",
"DIST_GIT_URL": "https://src{{ env_suffix }}.fedoraproject.org/{namespace}/{name}",
{% if env == 'staging' %}
"SECRET_KEY": "{{ stg_fpdc_secret_key }}",
"DB_PASSWORD": "{{ fpdc_stg_db_pass }}",
"DB_HOST": "{{ fpdc_stg_db_server }}",
"OIDC_RP_CLIENT_ID": "{{ fpdc_stg_client_id }}",
"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_RP_CLIENT_ID": "{{ fpdc_client_id }}",
"OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}"
{% endif %}
}

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

@ -1,3 +1,4 @@
{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
@ -7,24 +8,4 @@ metadata:
app: fpdc app: fpdc
data: data:
config.json: |- config.json: |-
{ {{ load_file('config.json') | indent }}
"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",
"DIST_GIT_URL": "https://src{{ env_suffix }}.fedoraproject.org/{namespace}/{name}",
{% if env == 'staging' %}
"SECRET_KEY": "{{ stg_fpdc_secret_key }}",
"DB_PASSWORD": "{{ fpdc_stg_db_pass }}",
"DB_HOST": "{{ fpdc_stg_db_server }}",
"OIDC_RP_CLIENT_ID": "{{ fpdc_stg_client_id }}",
"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_RP_CLIENT_ID": "{{ fpdc_client_id }}",
"OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}"
{% endif %}
}