From 92f05807241f582bbf4dd38b5c5121ed29e067ff Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Thu, 3 Aug 2017 21:26:08 +0000
Subject: [PATCH] fix osbs_secret_files again

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 inventory/group_vars/osbs-stg                  |  9 +++++++++
 playbooks/groups/osbs-orchestrator-cluster.yml | 16 +++++++++-------
 roles/osbs-secret/tasks/main.yml               |  8 --------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 1e5c08ec56..fea77c17d5 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -111,3 +111,12 @@ osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}"
 #nodeselectors
 osbs_orchestrator_default_nodeselector: "orchestrator=true"
 osbs_worker_default_nodeselector: "worker=true"
+
+
+osbs_secret_files_list:
+- source: "{{ private }}/groups/osbs-{{ env }}/koji/cert"
+  dest: cert
+- source: "{{ private }}/groups/osbs-{{ env }}/koji/ca"
+  dest: ca
+- source: "{{ private }}/groups/osbs-{{ env }}/koji/serverca"
+  dest: serverca
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index f8de62a111..5312a828af 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -265,6 +265,14 @@
     when: env == 'staging'
     tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
 
+  tasks:
+    - name: place osbs_secret_files if they do not exist
+      copy:
+        src: "{{item.source}}"
+        dest: "{{item.dest}}"
+      with_items: "{{ osbs_secret_files_list }}"
+      tags:
+      - oc
 
 - name: Setup OSBS requirements for OpenShift cluster hosts
   hosts: osbs-orchestrators-stg:osbs-workers-stg
@@ -374,13 +382,7 @@
   - role: osbs-secret
     osbs_namespace: "{{ osbs_worker_namespace }}"
     osbs_secret_name: "{{ koji_secret_name }}"
-    osbs_secret_files:
-    - source: "{{ private }}/groups/osbs-{{ env }}/koji/cert"
-      dest: cert
-    - source: "{{ private }}/groups/osbs-{{ env }}/koji/ca"
-      dest: ca
-    - source: "{{ private }}/groups/osbs-{{ env }}/koji/serverca"
-      dest: serverca
+    osbs_secret_files: "{{ osbs_secret_files_list }}"
 
 - name: setup worker namespace
   hosts: osbsworker-x86-64-masters-stg[0]
diff --git a/roles/osbs-secret/tasks/main.yml b/roles/osbs-secret/tasks/main.yml
index fa9817acc4..72e1065ffe 100644
--- a/roles/osbs-secret/tasks/main.yml
+++ b/roles/osbs-secret/tasks/main.yml
@@ -1,12 +1,4 @@
 ---
-- name: place osbs_secret_files if they do not exist
-  copy:
-    src: "{{item.source}}"
-    dest: "{{item.dest}}"
-  with_items: "{{ osbs_secret_files }}"
-  tags:
-  - oc
-
 - name: create secrets resource file
   template:
     src: openshift-secret.yml.j2