From 895d3b83ff901afb26120f164f37392288b4e623 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 11 Apr 2018 22:43:54 +0200 Subject: [PATCH] Add a CORS_URL to waiverdb and combine all staging/prod specific variables in one place Signed-off-by: Pierre-Yves Chibon --- roles/openshift-apps/waiverdb/templates/configmap.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/openshift-apps/waiverdb/templates/configmap.yml b/roles/openshift-apps/waiverdb/templates/configmap.yml index 469c2f6475..f7d38d6179 100644 --- a/roles/openshift-apps/waiverdb/templates/configmap.yml +++ b/roles/openshift-apps/waiverdb/templates/configmap.yml @@ -9,20 +9,19 @@ data: {% if env == 'staging' %} DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.phx2.fedoraproject.org:5432/waiverdb' RESULTSDB_API_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/api/v2.0' + CORS_URL = 'https://bodhi.stg.fedoraproject.org' + MESSAGE_BUS_PUBLISH = True {% else %} DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.phx2.fedoraproject.org:5432/waiverdb' RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0' + CORS_URL = 'https://bodhi.fedoraproject.org' + MESSAGE_BUS_PUBLISH = False {% endif %} AUTH_METHOD = 'OIDC' OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver' OIDC_CLIENT_SECRETS = '/etc/secret/client_secrets.json' SUPERUSERS = ['bodhi@service'] PORT = 8080 -{% if env == 'staging' %} - MESSAGE_BUS_PUBLISH = True -{% else %} - MESSAGE_BUS_PUBLISH = False -{% endif %} --- apiVersion: v1 kind: ConfigMap