From 5e2305acc0b87a81804390a6f70086d08617e8f8 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Mon, 18 Jun 2018 11:43:37 +0200
Subject: [PATCH] Try to use set_fact to make the auth_info var

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 playbooks/groups/osbs-cluster.yml | 38 +++++--------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 68996a3cc2..19c9f16880 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -565,7 +565,7 @@
 - name: Add dockercfg secret to allow registry push orchestrator
   hosts: osbs-masters-stg[0]:osbs-masters[0]
   tags:
-    - osbs-dockercfg-secret-orchestrator
+    - osbs-dockercfg-secret
   user: root
 
   vars_files:
@@ -573,11 +573,12 @@
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-  vars:
-    auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}"
-    auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}"
-
   pre_tasks:
+    - set_fact:
+        auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}"
+        auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}"
+
+      origin_version: "{{origin_version_out.stdout}}"
     - name: Create the dockercfg secret file
       local_action: >
         template
@@ -593,33 +594,6 @@
     - source: "/tmp/.dockercfg"
       dest: .dockercfg
 
-  post_tasks:
-    - name: Delete the temporary secret file
-      local_action: >
-        file
-        state=absent
-        path="/tmp/.dockercfg"
-
-
-- name: Add dockercfg secret to allow registry push worker
-  hosts: osbs-masters-stg[0]:osbs-masters[0]
-  tags:
-    - osbs-dockercfg-secret-worker
-  user: root
-
-  vars_files:
-    - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
-    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-  pre_tasks:
-    - name: Create the dockercfg secret file
-      local_action: >
-        template
-        src="{{ files }}/osbs/dockercfg-{{env}}-secret.j2"
-        dest="/tmp/.dockercfg"
-        mode=0400
-
-  roles:
   - role: osbs-secret
     osbs_namespace: "{{ osbs_worker_namespace }}"
     osbs_secret_name: "v2-registry-dockercfg"