From 6b8b45c4353b00d08bc102e16f7fe04bbc96be65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 17 Jan 2022 13:19:12 +0100
Subject: [PATCH] Move datagrepper2 to prod
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             | 10 ----------
 playbooks/openshift-apps/datagrepper.yml               |  2 +-
 .../datagrepper/templates/datagrepper.cfg.py           |  2 +-
 .../datagrepper/templates/deploymentconfig.yml         |  6 +++---
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 6308f126c9..2615efc704 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -249,16 +249,6 @@
     destname: datagrepper
     remotepath: /datagrepper
     localpath: /datagrepper
-    rewrite: true
-    proxyurl: http://localhost:10028
-    tags:
-    - datagrepper
-
-  - role: httpd/reverseproxy
-    website: apps.fedoraproject.org
-    destname: datagrepper2
-    remotepath: /datagrepper2
-    localpath: /datagrepper2
     balancer_name: app-os
     targettype: openshift
     keephost: true
diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml
index 934dfbb012..7af384df71 100644
--- a/playbooks/openshift-apps/datagrepper.yml
+++ b/playbooks/openshift-apps/datagrepper.yml
@@ -58,7 +58,7 @@
     app: datagrepper
     routename: datagrepper
     host: "apps{{ env_suffix }}.fedoraproject.org"
-    path: "/datagrepper2"
+    path: "/datagrepper"
     serviceport: web
     servicename: datagrepper-web
     annotations:
diff --git a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py
index 8b771adef4..d78b25d058 100644
--- a/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py
+++ b/roles/openshift-apps/datagrepper/templates/datagrepper.cfg.py
@@ -2,7 +2,7 @@
 # This is the config file for Datagrepper as intended to be used in OpenShift
 #
 
-APP_PATH = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper2"
+APP_PATH = "https://apps{{ env_suffix }}.fedoraproject.org/datagrepper"
 DEFAULT_QUERY_DELTA = 3600
 DATANOMMER_SQLALCHEMY_URL = "postgresql://{{ datanommerDBUser }}:{{ (env == 'production')|ternary(datanommerDBPassword, datanommer_stg_db_password) }}@db-datanommer{{ (env == 'production')|ternary('02', '01') }}{{ env_suffix }}.iad2.fedoraproject.org/datanommer2"
 
diff --git a/roles/openshift-apps/datagrepper/templates/deploymentconfig.yml b/roles/openshift-apps/datagrepper/templates/deploymentconfig.yml
index 2a8aa5b32c..2ee04eeac4 100644
--- a/roles/openshift-apps/datagrepper/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/datagrepper/templates/deploymentconfig.yml
@@ -48,20 +48,20 @@ spec:
         - name: APP_CONFIG
           value: "/etc/datagrepper/gunicorn.conf.py"
         - name: SCRIPT_NAME
-          value: "/datagrepper2"
+          value: "/datagrepper"
         readinessProbe:
           timeoutSeconds: 10
           initialDelaySeconds: 5
           periodSeconds: 60
           httpGet:
-            path: "/datagrepper2/healthz/ready"
+            path: "/datagrepper/healthz/ready"
             port: 8080
         livenessProbe:
           timeoutSeconds: 10
           initialDelaySeconds: 3
           periodSeconds: 60
           httpGet:
-            path: "/datagrepper2/healthz/live"
+            path: "/datagrepper/healthz/live"
             port: 8080
       volumes:
       - name: datagrepper-config-volume