From 8334489a7598e05bd0c18e8d2fabe6917922a526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 1 Sep 2020 15:36:36 +0200
Subject: [PATCH] FASJSON: fixup install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/include/proxies-reverseproxy.yml    |  7 +++++++
 playbooks/openshift-apps/fasjson.yml          | 20 +++++++++++++------
 .../fasjson/templates/route.yml               | 16 ---------------
 3 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 roles/openshift-apps/fasjson/templates/route.yml

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 48db3b7f85..beaff0a5c5 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -160,6 +160,13 @@
     targettype: openshift
     keephost: true
 
+  - role: httpd/reverseproxy
+    website: "fasjson{{ env_suffix }}.fedoraproject.org"
+    destname: fasjson
+    balancer_name: app-os
+    targettype: openshift
+    keephost: true
+
   - role: httpd/reverseproxy
     website: "id{{ env_suffix }}.fedoraproject.org"
     destname: id
diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml
index 67c65ff594..e9aa0f2ec6 100644
--- a/playbooks/openshift-apps/fasjson.yml
+++ b/playbooks/openshift-apps/fasjson.yml
@@ -87,10 +87,14 @@
     file: service.yml
     objectname: service.yml
 
-  - role: openshift/object
+  - role: openshift/route
     app: fasjson
-    template: route.yml
-    objectname: route.yml
+    routename: fasjson
+    host: "fasjson{{ env_suffix }}.fedoraproject.org"
+    serviceport: web
+    servicename: fasjson-web
+    annotations:
+      haproxy.router.openshift.io/timeout: 5m
 
   - role: openshift/object
     app: fasjson
@@ -102,6 +106,10 @@
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
-  - role: openshift/start-build
-    app: fasjson
-    buildname: fasjson
+  # - role: openshift/start-build
+  #   app: fasjson
+  #   buildname: fasjson
+
+  # - role: openshift/rollout
+  #   app: noggin
+  #   dcname: noggin
diff --git a/roles/openshift-apps/fasjson/templates/route.yml b/roles/openshift-apps/fasjson/templates/route.yml
deleted file mode 100644
index 2172d3276f..0000000000
--- a/roles/openshift-apps/fasjson/templates/route.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Route
-metadata:
-  name: fasjson-web
-  labels:
-    app: fasjson
-spec:
-  host: fasjson{{ env_suffix }}.fedoraproject.org
-  port:
-    targetPort: web
-  to:
-    kind: Service
-    name: fasjson-web
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect