From 45a8658c046b99fa20daa5b01c8bd41f26acdd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 20 Aug 2020 13:23:32 +0200
Subject: [PATCH] Noggin: small fixups
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/openshift-apps/noggin.yml                   | 4 ++--
 roles/openshift-apps/noggin/files/imagestream.yml     | 6 ------
 roles/openshift-apps/noggin/templates/buildconfig.yml | 1 -
 roles/openshift/ipa-client/templates/ldap.conf        | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 roles/openshift-apps/noggin/files/imagestream.yml

diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml
index 570df44cfa..0f9529fdda 100644
--- a/playbooks/openshift-apps/noggin.yml
+++ b/playbooks/openshift-apps/noggin.yml
@@ -17,7 +17,7 @@
 
   - role: openshift/project
     app: noggin
-    description: noggin
+    description: "Self-service account portal"
     appowners:
     - abompard
     - pingou
@@ -26,7 +26,7 @@
     when: env == "production"
   - role: openshift/project
     app: noggin
-    description: noggin
+    description: "Self-service account portal"
     appowners:
     - abompard
     - pingou
diff --git a/roles/openshift-apps/noggin/files/imagestream.yml b/roles/openshift-apps/noggin/files/imagestream.yml
deleted file mode 100644
index cffb947489..0000000000
--- a/roles/openshift-apps/noggin/files/imagestream.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: noggin
-  labels:
-    app: noggin
diff --git a/roles/openshift-apps/noggin/templates/buildconfig.yml b/roles/openshift-apps/noggin/templates/buildconfig.yml
index 65c89de5b8..1ca1710cfa 100644
--- a/roles/openshift-apps/noggin/templates/buildconfig.yml
+++ b/roles/openshift-apps/noggin/templates/buildconfig.yml
@@ -35,7 +35,6 @@ spec:
     github:
       secret: "{{ noggin_stg_github_secret }}"
 {% elif noggin_github_secret is defined and env == 'production' %}
-  - type: GitHub
     github:
       secret: "{{ noggin_github_secret }}"
 {% endif %}
diff --git a/roles/openshift/ipa-client/templates/ldap.conf b/roles/openshift/ipa-client/templates/ldap.conf
index ecc6a3cc94..58f2cead25 100644
--- a/roles/openshift/ipa-client/templates/ldap.conf
+++ b/roles/openshift/ipa-client/templates/ldap.conf
@@ -1,4 +1,4 @@
-SASL_NOCANON	on
+SASL_NOCANON on
 URI ldaps://{{ ipa_server }}
 BASE {% if env == "staging" %}dc=stg,{% endif %}dc=fedoraproject,dc=org
 TLS_CACERT /etc/ipa/ca.crt