From 5b2d573432572c93262fbde354c7638af9443b0d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 15 Jun 2022 15:32:30 -0700 Subject: [PATCH] greenwave: move to ocp4 Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-reverseproxy.yml | 4 ++-- playbooks/openshift-apps/greenwave.yml | 2 +- roles/openshift-apps/greenwave/templates/settings.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 0e8d7b5293..2b0739af5f 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -847,9 +847,9 @@ website: greenwave.fedoraproject.org destname: greenwave balancer_name: app-os - balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}" + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" targettype: openshift - ocp4: false + ocp4: true keephost: true tags: greenwave diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index d781a5e367..7e0b725e8f 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0] + hosts: os_control[0]:os_control_stg[0] user: root gather_facts: False diff --git a/roles/openshift-apps/greenwave/templates/settings.py b/roles/openshift-apps/greenwave/templates/settings.py index fa65f8c386..46aa41c450 100644 --- a/roles/openshift-apps/greenwave/templates/settings.py +++ b/roles/openshift-apps/greenwave/templates/settings.py @@ -12,7 +12,7 @@ BODHI_URL = 'https://bodhi.stg.fedoraproject.org/' SECRET_KEY = '{{stg_greenwave_secret_key}}' WAIVERDB_API_URL = 'https://waiverdb.stg.fedoraproject.org/api/v1.0' -RESULTSDB_API_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/api/v2.0' +RESULTSDB_API_URL = 'https://resultsdb.stg.fedoraproject.org/api/v2.0' GREENWAVE_API_URL = 'https://greenwave.stg.fedoraproject.org/api/v1.0' CORS_URL = '*' MESSAGING = "fedora-messaging" @@ -24,7 +24,7 @@ BODHI_URL = 'https://bodhi.fedoraproject.org/' SECRET_KEY = '{{prod_greenwave_secret_key}}' WAIVERDB_API_URL = 'https://waiverdb.fedoraproject.org/api/v1.0' -RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0' +RESULTSDB_API_URL = 'https://resultsdb.fedoraproject.org/api/v2.0' GREENWAVE_API_URL = 'https://greenwave.fedoraproject.org/api/v1.0' CORS_URL = 'https://bodhi.fedoraproject.org' MESSAGING = "fedora-messaging"