From af01660d2741d593719bae17961328520b88a069 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Mon, 12 Mar 2018 11:17:27 +0100
Subject: [PATCH] Add osbs worker namespace to main playbook but only stg

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 playbooks/groups/osbs-cluster.yml         | 42 +++++++++++++++++++++++
 playbooks/manual/osbs-workernamespace.yml | 39 ---------------------
 2 files changed, 42 insertions(+), 39 deletions(-)
 delete mode 100644 playbooks/manual/osbs-workernamespace.yml

diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 3a3dbc7aa9..04bf1c9471 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -419,6 +419,48 @@
         creates: "/etc/origin/koji-builder-policy-added"
       environment: "{{ osbs_environment }}"
 
+{% if env == 'staging' %}
+  - name: Create worker namespace
+    hosts: osbs-masters-stg[0]
+    tags:
+      - osbs-worker-namespace
+    user: root
+    roles:
+      - role: osbs-namespace
+        osbs_namespace: "{{ osbs_worker_namespace }}"
+        osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
+        osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
+        osbs_authoritative_registry: "{{ source_registry }}"
+        osbs_sources_command: "{{ osbs_conf_sources_command }}"
+        osbs_vendor: "{{ osbs_conf_vendor }}"
+
+  - name: setup koji secret in worker namespace
+    hosts: osbs-masters-stg[0]
+    tags:
+      - osbs-worker-namespace
+    roles:
+    - role: osbs-secret
+      osbs_namespace: "{{ osbs_worker_namespace }}"
+      osbs_secret_name: kojisecret
+      osbs_secret_files:
+      - source: "/etc/pki/koji/fedora-builder.pem"
+        dest: cert
+
+  - name: setup dist registry secret in worker namespace
+    hosts: osbs-masters-stg[0]
+    tags:
+      - osbs-worker-namespace
+    roles:
+    - role: osbs-secret
+      osbs_namespace: "{{ osbs_worker_namespace }}"
+      osbs_secret_name: registry-secret
+      osbs_secret_files:
+      - source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
+        dest: registry.crt
+      - source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
+        dest: registry.key
+{% endif %}
+
 - name: Manage docker images and image stream
   hosts: osbs-masters-stg[0]:osbs-masters[0]
   tags:
diff --git a/playbooks/manual/osbs-workernamespace.yml b/playbooks/manual/osbs-workernamespace.yml
deleted file mode 100644
index 24c300fdd6..0000000000
--- a/playbooks/manual/osbs-workernamespace.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-- name: Create worker namespace
-  hosts: osbs-masters-stg[0]
-  tags:
-    - osbs-worker-namespace
-  user: root
-  roles:
-    - role: osbs-namespace
-      osbs_namespace: "{{ osbs_worker_namespace }}"
-      osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
-      osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
-      osbs_authoritative_registry: "{{ source_registry }}"
-      osbs_sources_command: "{{ osbs_conf_sources_command }}"
-      osbs_vendor: "{{ osbs_conf_vendor }}"
-
-- name: setup koji secret in worker namespace
-  hosts: osbs-masters-stg[0]
-  tags:
-    - osbs-worker-namespace
-  roles:
-  - role: osbs-secret
-    osbs_namespace: "{{ osbs_worker_namespace }}"
-    osbs_secret_name: kojisecret
-    osbs_secret_files:
-    - source: "/etc/pki/koji/fedora-builder.pem"
-      dest: cert
-
-- name: setup dist registry secret in worker namespace
-  hosts: osbs-masters-stg[0]
-  tags:
-    - osbs-worker-namespace
-  roles:
-  - role: osbs-secret
-    osbs_namespace: "{{ osbs_worker_namespace }}"
-    osbs_secret_name: registry-secret
-    osbs_secret_files:
-    - source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
-      dest: registry.crt
-    - source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
-      dest: registry.key