From d92ff97453fbdbedf34593b41d55e36186d3f75a Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Thu, 26 Apr 2018 14:35:36 +0200
Subject: [PATCH] Add the tag to all play and fix template

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 playbooks/groups/osbs-cluster.yml                      | 10 ++++++++++
 .../templates/client-config-secret.conf.j2             |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 9c767dc64e..a7fbf71741 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -482,6 +482,8 @@
     - source: "/tmp/{{ osbs_namespace }}-reactor-config-secret.yml"
       dest: config.yaml
     when: env == "staging"
+  tags:
+    - osbs-orchestrator-namespace
 
 - name: setup client config secret in orchestrator namespace
   hosts: osbs-masters-stg[0]
@@ -492,6 +494,8 @@
     - source: "/tmp/{{ osbs_namespace }}-client-config-secret.conf"
       dest: osbs.conf
     when: env == "staging"
+  tags:
+    - osbs-orchestrator-namespace
 
 - name: setup koji secret in orchestrator namespace
   hosts: osbs-masters-stg[0]
@@ -506,6 +510,8 @@
     - source: "{{ private }}/files/koji/containerbuild.pem"
       dest: cert
     when: env == "staging"
+  tags:
+    - osbs-orchestrator-namespace
 
 - name: setup dist registry secret in orchestrator namespace
   hosts: osbs-masters-stg[0]
@@ -522,6 +528,8 @@
     - source: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key"
       dest: registry.key
     when: env == "staging"
+  tags:
+    - osbs-orchestrator-namespace
 
 - name: setup orchestrator token for x86_64-osbs
   hosts: osbs-masters-stg[0]
@@ -536,6 +544,8 @@
     - source: "{{ private }}/files/osbs/staging/x86-64-osbs-stg-orchestrator"
       dest: token
     when: env == "staging"
+  tags:
+    - osbs-orchestrator-namespace
 
 - name: Manage docker images and image stream
   hosts: osbs-masters-stg[0]:osbs-masters[0]
diff --git a/roles/osbs-namespace/templates/client-config-secret.conf.j2 b/roles/osbs-namespace/templates/client-config-secret.conf.j2
index 64c142b243..a9e8b6b399 100644
--- a/roles/osbs-namespace/templates/client-config-secret.conf.j2
+++ b/roles/osbs-namespace/templates/client-config-secret.conf.j2
@@ -26,7 +26,7 @@ koji_hub = {{ osbs_koji_hub }}
 {% if osbs_koji_root %}
 koji_root = {{ osbs_koji_root }}
 {% endif %}
-{% koji_use_kerberos %}
+{% if koji_use_kerberos %}
 koji_use_kerberos = {{ koji_use_kerberos }}
 {% endif %}
 {% if koji_kerberos_keytab %}