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

FMN: adjust the config file to the recent code changes, again

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2023-01-30 16:56:19 +01:00
parent 690882f5e4
commit 35b35127e4
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/openshift-apps/fmn/templates/deploymentconfig.yml
View file

@ -241,6 +241,11 @@ spec:
secretKeyRef: secretKeyRef:
name: fmn name: fmn
key: redis-password key: redis-password
- name: CACHE__ARGUMENTS__HASH_KEY
valueFrom:
secretKeyRef:
name: fmn
key: cache-hash-key
volumes: volumes:
- name: etc-fmn - name: etc-fmn
configMap: configMap:

5
roles/openshift-apps/fmn/templates/fmn.cfg
View file

@ -7,5 +7,6 @@ OIDC_CLIENT_ID="fmn"
# OIDC_CLIENT_SECRET is set in the environement by the deploymentconfig # OIDC_CLIENT_SECRET is set in the environement by the deploymentconfig
SERVICES__FASJSON_URL=https://fasjson{{ env_suffix }}.fedoraproject.org SERVICES__FASJSON_URL=https://fasjson{{ env_suffix }}.fedoraproject.org
SERVICES__DISTGIT_URL=https://src{{ env_suffix }}.fedoraproject.org SERVICES__DISTGIT_URL=https://src{{ env_suffix }}.fedoraproject.org
CACHE__BACKEND="dogpile.cache.redis" CACHE__URL="rediss://redis.fmn.svc.cluster.local/"
CACHE__ARGUMENTS__HOST="redis.fmn.svc.cluster.local" CACHE__ARGUMENTS__DB="1"
CACHE__ARGUMENTS__DIGESTMOD="sha1"

2
roles/openshift-apps/fmn/templates/secrets.yml
View file

@ -7,7 +7,9 @@ stringData:
{% if env == 'staging' %} {% if env == 'staging' %}
oidc-client-secret: {{ fmn_stg_oidc_client_secret }} oidc-client-secret: {{ fmn_stg_oidc_client_secret }}
redis-password: {{ fmn_stg_redis_password }} redis-password: {{ fmn_stg_redis_password }}
cache-hash-key: {{ fmn_stg_cache_hash_key }}
{% else %} {% else %}
oidc-client-secret: {{ fmn_prod_oidc_client_secret }} oidc-client-secret: {{ fmn_prod_oidc_client_secret }}
redis-password: {{ fmn_prod_redis_password }} redis-password: {{ fmn_prod_redis_password }}
cache-hash-key: {{ fmn_prod_cache_hash_key }}
{% endif %} {% endif %}