From 5cbf46d3b438ef9c121b170c48ee0954fc6c9b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Fri, 13 May 2022 11:03:24 +0200
Subject: [PATCH] Move Noggin to OCP4 on 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           | 12 ++++++++++++
 playbooks/openshift-apps/fasjson.yml                 |  1 -
 playbooks/openshift-apps/noggin.yml                  |  2 +-
 .../openshift-apps/noggin/templates/buildconfig.yml  |  5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 90013f1a86..ed0211846a 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -192,6 +192,18 @@
     targettype: openshift
     keephost: true
     tags: noggin
+    when: env != "staging"
+
+  - role: httpd/reverseproxy
+    website: "accounts{{ env_suffix }}.fedoraproject.org"
+    destname: noggin
+    balancer_name: apps-ocp
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
+    targettype: openshift
+    keephost: true
+    ocp4: true
+    tags: noggin
+    when: env == "staging"
 
   - role: httpd/reverseproxy
     website: "fasjson{{ env_suffix }}.fedoraproject.org"
diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml
index 2ff93693b1..42afbb3f4a 100644
--- a/playbooks/openshift-apps/fasjson.yml
+++ b/playbooks/openshift-apps/fasjson.yml
@@ -9,7 +9,6 @@
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   vars:
-    - ocp4: true
 
   roles:
   - role: openshift/project
diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml
index c450eba2ae..706857c768 100644
--- a/playbooks/openshift-apps/noggin.yml
+++ b/playbooks/openshift-apps/noggin.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_masters[0]:os_masters_stg[0]
+  hosts: os_masters[0]:os_control_stg[0]
   user: root
   gather_facts: False
 
diff --git a/roles/openshift-apps/noggin/templates/buildconfig.yml b/roles/openshift-apps/noggin/templates/buildconfig.yml
index 5736291f67..7e6ff4c10e 100644
--- a/roles/openshift-apps/noggin/templates/buildconfig.yml
+++ b/roles/openshift-apps/noggin/templates/buildconfig.yml
@@ -22,8 +22,9 @@ spec:
     sourceStrategy:
       from:
 {% if env == "staging" %}
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi8/python-39
+        kind: ImageStreamTag
+        name: python:3.9-ubi8
+        namespace: openshift
 {% else %}
         kind: ImageStreamTag
         name: python:3.6