From 17ebec7706504efeea679fcc4a86f3b7864cc397 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 14 Jun 2022 16:20:32 -0700 Subject: [PATCH] discourse2fedmsg: roll back to ocp3 in prod for now Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-reverseproxy.yml | 12 ++++++++++++ playbooks/openshift-apps/discourse2fedmsg.yml | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 121aa6c0e2..0cd5fd92d6 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -1005,6 +1005,18 @@ 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 979073b549..79be45f389 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_control[0]:os_control_stg[0] + hosts: os_masters[0]:os_control_stg[0] user: root gather_facts: False @@ -60,7 +60,7 @@ - role: openshift/route app: discourse2fedmsg routename: discourse2fedmsg - host: "discourse2fedmsg{{ env_suffix }}.fedoraproject.org" + host: "discourse2fedmsg.app.os{{ env_suffix }}.fedoraproject.org" serviceport: web servicename: discourse2fedmsg-web