From 6a1b069423152776d3415e3cb30216ff1a589477 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 15 Jun 2022 10:20:15 -0700 Subject: [PATCH] discourse2fedmsg: switch back to ocp4 cluster Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-reverseproxy.yml | 12 ------------ playbooks/openshift-apps/discourse2fedmsg.yml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 762b8830f0..8073f6c7e5 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -1005,18 +1005,6 @@ ocp4: true keephost: true tags: discourse2fedmsg - when: env == "staging" - - - role: httpd/reverseproxy - website: "discourse2fedmsg{{ env_suffix }}.fedoraproject.org" - destname: discourse2fedmsg - balancer_name: app-os - balancer_members: "{{ (env == 'staging')|ternary(o_nodes_stg, openshift_nodes) }}" - targettype: openshift - ocp4: false - keephost: true - tags: discourse2fedmsg - when: env != "staging" - role: httpd/reverseproxy website: ipsilon-project.org diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 79be45f389..b30dd099e5 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -60,7 +60,7 @@ - role: openshift/route app: discourse2fedmsg routename: discourse2fedmsg - host: "discourse2fedmsg.app.os{{ env_suffix }}.fedoraproject.org" + host: "discourse2fedmsg{{ env_suffix }}.fedoraproject.org" serviceport: web servicename: discourse2fedmsg-web