set the proxy to point to openshift kerneltest

Signed-off-by: Ryan Lerch <rlerch@redhat.com>

playbooks/include/proxies-reverseproxy.yml

@@ -248,9 +248,13 @@
     destname: kerneltest
     remotepath: /kerneltest
     localpath: /kerneltest
+    balancer_name: apps-ocp
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
+    targettype: openshift
+    ocp4: true
+    keephost: true
     header_scheme: true
-    proxyurl: "{{ varnish_url }}"
+    tags: kerneltest
-    when: env != "staging"
 
   - role: httpd/reverseproxy
     website: qa.fedoraproject.org

playbooks/openshift-apps/kerneltest.yml

@@ -95,9 +95,12 @@
   - role: openshift/route
     app: kerneltest
     routename: kerneltest
-    host: "kerneltest.apps.ocp{{ env_suffix }}.fedoraproject.org"
+    host: "apps{{ env_suffix }}.fedoraproject.org"
+    path: "/kerneltest"
     serviceport: web
     servicename: kerneltest-web
+    annotations:
+      haproxy.router.openshift.io/timeout: 5m
 
   - role: openshift/object
     app: kerneltest

roles/openshift-apps/kerneltest/templates/client_secrets.json

@@ -1,6 +1,6 @@
 {% if env == 'staging' %}
 {"web": {
-  "redirect_uris": ["https://kerneltest.apps.ocp.stg.fedoraproject.org/oidc_callback"],
+  "redirect_uris": ["https://apps.stg.fedoraproject.org/kerneltest/oidc_callback"],
   "token_uri": "https://id.stg.fedoraproject.org/openidc/Token",
   "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization",
   "client_id": "kerneltest-stg",
@@ -12,7 +12,7 @@
 }
 {% else %}
 {"web": {
-  "redirect_uris": ["https://kerneltest.apps.ocp.fedoraproject.org/oidc_callback"],
+  "redirect_uris": ["https://apps.fedoraproject.org/kerneltest/oidc_callback"],
   "token_uri": "https://id.fedoraproject.org/openidc/Token",
   "auth_uri": "https://id.fedoraproject.org/openidc/Authorization",
   "client_id": "kerneltest",