FASJSON: fixup install

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

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

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

roles/openshift-apps/fasjson/templates/route.yml

@@ -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