From 6c6792a2313417791b3131f357b2fac694f26b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 16 May 2022 10:34:09 +0200
Subject: [PATCH] Deploy the Noggin update 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/noggin-centos.yml            |  2 +-
 playbooks/openshift-apps/noggin.yml                   |  2 +-
 roles/openshift-apps/noggin/templates/buildconfig.yml |  6 ------
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 25a7cbcde1..3fd3bc5f57 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -185,15 +185,6 @@
     tags:
     - fas
 
-  - role: httpd/reverseproxy
-    website: "accounts{{ env_suffix }}.fedoraproject.org"
-    destname: noggin
-    balancer_name: app-os
-    targettype: openshift
-    keephost: true
-    tags: noggin
-    when: env != "staging"
-
   - role: httpd/reverseproxy
     website: "accounts{{ env_suffix }}.fedoraproject.org"
     destname: noggin
@@ -203,7 +194,6 @@
     keephost: true
     ocp4: true
     tags: noggin
-    when: env == "staging"
 
   - role: httpd/reverseproxy
     website: "fasjson{{ env_suffix }}.fedoraproject.org"
diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml
index d68cfd31ba..3784a9a0a2 100644
--- a/playbooks/openshift-apps/noggin-centos.yml
+++ b/playbooks/openshift-apps/noggin-centos.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_masters[0]:os_control_stg[0]
+  hosts: os_control[0]:os_control_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml
index 706857c768..70c739e55f 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_control_stg[0]
+  hosts: os_control[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 7e6ff4c10e..198c1bb9b6 100644
--- a/roles/openshift-apps/noggin/templates/buildconfig.yml
+++ b/roles/openshift-apps/noggin/templates/buildconfig.yml
@@ -21,15 +21,9 @@ spec:
     type: Source
     sourceStrategy:
       from:
-{% if env == "staging" %}
         kind: ImageStreamTag
         name: python:3.9-ubi8
         namespace: openshift
-{% else %}
-        kind: ImageStreamTag
-        name: python:3.6
-        namespace: openshift
-{% endif %}
   output:
     to:
       kind: ImageStreamTag