mote_v2: deploy to prod

playbooks/include/proxies-reverseproxy.yml

@@ -100,10 +100,12 @@
   - role: httpd/reverseproxy
     website: meetbot.fedoraproject.org
     destname: mote
-    #remotepath: /mote/
+    balancer_name: app-os
-    # Talk directly to the app server, not haproxy
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
-    proxyurl: http://value01
+    targettype: openshift
-    when: env != "staging"
+    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

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

roles/openshift-apps/mote/templates/buildconfig.yml

@@ -13,8 +13,8 @@ spec:
   runPolicy: Serial
   source:
     git:
-      ref: cal_theme
+      ref: main
-      uri: https://github.com/darknao/mote.git
+      uri: https://github.com/fedora-infra/mote.git
     type: Git
   strategy:
     type: Docker