From fd58efe5b8cfaf03effadc5e2e76bd818bf921eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 12 Aug 2021 17:06:07 +0200
Subject: [PATCH] Make Datagrepper 2 available in staging
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 | 14 ++++++++++++++
 playbooks/openshift-apps/datagrepper.yml   |  7 ++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 3088338ec1..375de1568c 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -227,6 +227,20 @@
     localpath: /datagrepper
     rewrite: true
     proxyurl: http://localhost:10028
+    tags:
+    - datagrepper
+
+  - role: httpd/reverseproxy
+    website: apps.fedoraproject.org
+    destname: datagrepper2
+    remotepath: /datagrepper
+    localpath: /datagrepper2
+    balancer_name: app-os
+    targettype: openshift
+    keephost: true
+    when: env == "staging"
+    tags:
+    - datagrepper
 
   - role: httpd/reverseproxy
     website: badges.fedoraproject.org
diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml
index 34c769e455..9dedfbfd9b 100644
--- a/playbooks/openshift-apps/datagrepper.yml
+++ b/playbooks/openshift-apps/datagrepper.yml
@@ -34,9 +34,10 @@
       - apply-appowners
     when: env == "staging"
 
-  - role: openshift/imagestream
-    app: datagrepper
-    imagename: datagrepper
+  - role: openshift/object
+    app: datanommer
+    file: imagestream.yml
+    objectname: imagestream.yml
 
   - role: openshift/object
     app: datagrepper