From 3749d306a272a24cdb35b094947f89f7ca068120 Mon Sep 17 00:00:00 2001
From: Francois Andrieu <darknao@fedoraproject.org>
Date: Sun, 26 Jun 2022 18:02:33 +0200
Subject: [PATCH] mote_v2: deploy to prod

---
 playbooks/include/proxies-reverseproxy.yml    | 19 ++++++-------------
 playbooks/openshift-apps/mote.yml             |  5 ++++-
 .../mote/templates/buildconfig.yml            |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 5c6c515284..f2659ae127 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -100,10 +100,12 @@
   - role: httpd/reverseproxy
     website: meetbot.fedoraproject.org
     destname: mote
-    #remotepath: /mote/
-    # Talk directly to the app server, not haproxy
-    proxyurl: http://value01
-    when: env != "staging"
+    balancer_name: app-os
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
+    targettype: openshift
+    ocp4: true
+    keephost: true
+    tags: mote
 
   # The place for the raw originals
   - role: httpd/reverseproxy
@@ -114,15 +116,6 @@
     proxyurl: http://value02
     when: env == "staging"
 
-  # The place for the fancy mote view
-  - role: httpd/reverseproxy
-    website: meetbot.fedoraproject.org
-    destname: mote
-    #remotepath: /mote/
-    # Talk directly to the app server, not haproxy
-    proxyurl: http://value02
-    when: env == "staging"
-
   - role: httpd/reverseproxy
     website: apps.fedoraproject.org
     destname: nuancier
diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml
index 430ec1599d..ab95735640 100644
--- a/playbooks/openshift-apps/mote.yml
+++ b/playbooks/openshift-apps/mote.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_control_stg[0]
+  hosts: os_control[0]:os_control_stg[0]
   user: root
   gather_facts: False
   vars:
@@ -68,6 +68,9 @@
     routename: mote
     serviceport: mote-tcp
     servicename: mote
+    host: "meetbot{{ env_suffix }}.fedoraproject.org"
+    annotations:
+      haproxy.router.openshift.io/set-forwarded-headers: append
 
   - role: openshift/start-build
     buildname: mote
diff --git a/roles/openshift-apps/mote/templates/buildconfig.yml b/roles/openshift-apps/mote/templates/buildconfig.yml
index 0f6f1e1046..f29139a014 100644
--- a/roles/openshift-apps/mote/templates/buildconfig.yml
+++ b/roles/openshift-apps/mote/templates/buildconfig.yml
@@ -13,8 +13,8 @@ spec:
   runPolicy: Serial
   source:
     git:
-      ref: cal_theme
-      uri: https://github.com/darknao/mote.git
+      ref: main
+      uri: https://github.com/fedora-infra/mote.git
     type: Git
   strategy:
     type: Docker