From 8f587835782ce498ef5ed151eaa2861035e0a8e4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 15 Jun 2022 15:04:22 -0700 Subject: [PATCH] waiverdb: move to ocp4 in staging Signed-off-by: Kevin Fenzi --- playbooks/openshift-apps/waiverdb.yml | 2 +- roles/openshift-apps/waiverdb/templates/client_secrets.json | 2 +- roles/openshift-apps/waiverdb/templates/secret.yml | 2 +- roles/openshift-apps/waiverdb/templates/settings.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index 1bf7d4d9ff..0624d97973 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -27,7 +27,7 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0] + hosts: os_masters[0]:os_control_stg[0] user: root gather_facts: False diff --git a/roles/openshift-apps/waiverdb/templates/client_secrets.json b/roles/openshift-apps/waiverdb/templates/client_secrets.json index b15eedfb14..1897acd5f0 100644 --- a/roles/openshift-apps/waiverdb/templates/client_secrets.json +++ b/roles/openshift-apps/waiverdb/templates/client_secrets.json @@ -1,6 +1,6 @@ {% if env == 'staging' %} {"web": { - "redirect_uris": ["https://waiverdb-waiverdb.app.os.stg.fedoraproject.org/"], + "redirect_uris": ["https://waiverdb-waiverdb.apps.ocp.stg.fedoraproject.org/"], "token_uri": "https://id.stg.fedoraproject.org/openidc/Token", "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization", "client_id": "waiverdb-stg", diff --git a/roles/openshift-apps/waiverdb/templates/secret.yml b/roles/openshift-apps/waiverdb/templates/secret.yml index 3b88f14005..82d39ed0b4 100644 --- a/roles/openshift-apps/waiverdb/templates/secret.yml +++ b/roles/openshift-apps/waiverdb/templates/secret.yml @@ -14,7 +14,7 @@ stringData: {% endif %} client_secrets.json: |- {"web": { - "redirect_uris": ["https://waiverdb-waiverdb.app.os{{env_suffix}}fedoraproject.org/"], + "redirect_uris": ["https://waiverdb-waiverdb.apps.ocp{{env_suffix}}fedoraproject.org/"], "token_uri": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Token", "auth_uri": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Authorization", {% if env == 'staging' %} diff --git a/roles/openshift-apps/waiverdb/templates/settings.py b/roles/openshift-apps/waiverdb/templates/settings.py index 69edca1569..6cbe53783d 100644 --- a/roles/openshift-apps/waiverdb/templates/settings.py +++ b/roles/openshift-apps/waiverdb/templates/settings.py @@ -1,6 +1,6 @@ {% if env == 'staging' %} DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.iad2.fedoraproject.org:5432/waiverdb' -RESULTSDB_API_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/api/v2.0' +RESULTSDB_API_URL = 'https://resultsdb.stg.fedoraproject.org/api/v2.0' CORS_URL = 'https://bodhi.stg.fedoraproject.org' {% else %} DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.iad2.fedoraproject.org:5432/waiverdb'