From b57ec0f90a1b221c9faff5ff35aa275db2b01fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 16 May 2022 13:22:27 +0200
Subject: [PATCH] Migrate FASJSON to OCP4 in 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       | 16 ++++------------
 playbooks/include/proxies-websites.yml           |  2 ++
 playbooks/openshift-apps/fasjson.yml             |  2 +-
 .../openshift-apps/fasjson/templates/Dockerfile  |  4 +++-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 3fd3bc5f57..82f1c77981 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -193,16 +193,8 @@
     targettype: openshift
     keephost: true
     ocp4: true
-    tags: noggin
-
-  - role: httpd/reverseproxy
-    website: "fasjson{{ env_suffix }}.fedoraproject.org"
-    destname: fasjson
-    balancer_name: app-os
-    targettype: openshift
-    keephost: true
-    tags: fasjson
-    when: env != "staging"
+    tags:
+    - noggin
 
   - role: httpd/reverseproxy
     website: "fasjson{{ env_suffix }}.fedoraproject.org"
@@ -212,8 +204,8 @@
     targettype: openshift
     keephost: true
     ocp4: true
-    tags: fasjson
-    when: env == "staging"
+    tags:
+    - fasjson
 
   - role: httpd/reverseproxy
     website: "id{{ env_suffix }}.fedoraproject.org"
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 7d3d12253d..f9a2266c8d 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -292,6 +292,8 @@
     site_name: "accounts{{ env_suffix }}.fedoraproject.org"
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
+    tags:
+      - noggin
 
   - role: httpd/website
     site_name: "fasjson{{ env_suffix }}.fedoraproject.org"
diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml
index 42afbb3f4a..35c527c68a 100644
--- a/playbooks/openshift-apps/fasjson.yml
+++ b/playbooks/openshift-apps/fasjson.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/fasjson/templates/Dockerfile b/roles/openshift-apps/fasjson/templates/Dockerfile
index 09397596c3..f384d37a4b 100644
--- a/roles/openshift-apps/fasjson/templates/Dockerfile
+++ b/roles/openshift-apps/fasjson/templates/Dockerfile
@@ -1,4 +1,5 @@
-FROM fedora:34
+# Switch to F36 when this PR is shipped: https://github.com/python-ldap/python-ldap/pull/458
+FROM fedora:35
 LABEL \
   name="fasjson" \
   vendor="Fedora Infrastructure" \
@@ -10,6 +11,7 @@ RUN dnf install -y \
         git \
         ipa-client \
         gcc \
+        redhat-rpm-config \
         python-devel \
         krb5-devel \
         openldap-devel \