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

Blockerbugs: more vars shuffle

Browse source
This commit is contained in:
František Zatloukal 2022-09-27 21:46:37 +02:00
parent a96ca061a9
commit b84bd9b6e3
2 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
roles/openshift-apps/blockerbugs/templates/cron.yml
View file

@ -37,11 +37,23 @@ spec:
value: "{{ stg_blockerbugs_db_password }}"
- name: SECRET_KEY
value: "{{ stg_blockerbugs_secret_key }}"
- name: PAGURE_REPO_TOKEN
value: "{{ stg_blockerbugs_pagure_repo_token_secret }}"
- name: PAGURE_REPO_WEBHOOK_KEY
value: "{{ stg_blockerbugs_pagure_repo_webhook_key_secret }}"
- name: BUGZILLA_API_KEY
value: "{{ stg_blockerbugs_bz_api_key }}"
{% else %}
- name: POSTGRESQL_PASSWORD
value: "{{ prod_blockerbugs_db_password }}"
- name: SECRET_KEY
value: "{{ prod_blockerbugs_secret_key }}"
- name: PAGURE_REPO_TOKEN
value: "{{ prod_blockerbugs_pagure_repo_token_secret }}"
- name: PAGURE_REPO_WEBHOOK_KEY
value: "{{ prod_blockerbugs_pagure_repo_webhook_key_secret }}"
- name: BUGZILLA_API_KEY
value: "{{ prod_blockerbugs_bz_api_key }}"
{% endif %}
- name: SECRET_KEY
value: "{{ blockerbugs_secret_key }}"
@ -69,13 +81,6 @@ spec:
value: "{{ blockerbugs_pagure_url }}api/0/"
- name: BUGZILLA_URL
value: "{{ blockerbugs_bugzilla_url }}"
{% if env == 'staging' %}
- name: BUGZILLA_API_KEY
value: "{{ stg_blockerbugs_bz_api_key }}"
{% else %}
- name: BUGZILLA_API_KEY
value: "{{ prod_blockerbugs_bz_api_key }}"
{% endif %}
- name: BODHI_URL
value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
- name: OPENSHIFT_PROD

23
roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
View file

@ -55,11 +55,23 @@ spec:
value: "{{ stg_blockerbugs_db_password }}"
- name: SECRET_KEY
value: "{{ stg_blockerbugs_secret_key }}"
- name: PAGURE_REPO_TOKEN
value: "{{ stg_blockerbugs_pagure_repo_token_secret }}"
- name: PAGURE_REPO_WEBHOOK_KEY
value: "{{ stg_blockerbugs_pagure_repo_webhook_key_secret }}"
- name: BUGZILLA_API_KEY
value: "{{ stg_blockerbugs_bz_api_key }}"
{% else %}
- name: POSTGRESQL_PASSWORD
value: "{{ prod_blockerbugs_db_password }}"
- name: SECRET_KEY
value: "{{ prod_blockerbugs_secret_key }}"
- name: PAGURE_REPO_TOKEN
value: "{{ prod_blockerbugs_pagure_repo_token_secret }}"
- name: PAGURE_REPO_WEBHOOK_KEY
value: "{{ prod_blockerbugs_pagure_repo_webhook_key_secret }}"
- name: BUGZILLA_API_KEY
value: "{{ prod_blockerbugs_bz_api_key }}"
{% endif %}
- name: BLOCKERBUGS_URL
value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/"
@ -75,23 +87,12 @@ spec:
value: "True"
- name: PAGURE_REPO
value: "fedora-qa/blocker-review"
- name: PAGURE_REPO_TOKEN
value: "{{ blockerbugs_pagure_repo_token_secret }}"
- name: PAGURE_REPO_WEBHOOK_KEY
value: "{{ blockerbugs_pagure_repo_webhook_key_secret }}"
- name: PAGURE_URL
value: "{{ blockerbugs_pagure_url }}"
- name: PAGURE_API
value: "{{ blockerbugs_pagure_url }}api/0/"
- name: BUGZILLA_URL
value: "{{ blockerbugs_bugzilla_url }}"
{% if env == 'staging' %}
- name: BUGZILLA_API_KEY
value: "{{ stg_blockerbugs_bz_api_key }}"
{% else %}
- name: BUGZILLA_API_KEY
value: "{{ prod_blockerbugs_bz_api_key }}"
{% endif %}
- name: BODHI_URL
value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
- name: OPENSHIFT_PROD