From 9247f406b57ee738215258da536bcb7203a5179c Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Fri, 8 Jun 2018 13:31:42 +0200
Subject: [PATCH] Create the dockercfg secret in osbs

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 files/osbs/dockercfg-production-secret.j2 |  5 ++++
 files/osbs/dockercfg-staging-secret.j2    |  5 ++++
 playbooks/groups/osbs-cluster.yml         | 32 +++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 files/osbs/dockercfg-production-secret.j2
 create mode 100644 files/osbs/dockercfg-staging-secret.j2

diff --git a/files/osbs/dockercfg-production-secret.j2 b/files/osbs/dockercfg-production-secret.j2
new file mode 100644
index 0000000000..050b1c9e6d
--- /dev/null
+++ b/files/osbs/dockercfg-production-secret.j2
@@ -0,0 +1,5 @@
+{"candidate-registry.fedoraproject.org":
+    {"username": {{candidate_registry_osbs_prod_username}},
+     "password": {{candidate_registry_osbs_prod_password}},
+    }
+}
\ No newline at end of file
diff --git a/files/osbs/dockercfg-staging-secret.j2 b/files/osbs/dockercfg-staging-secret.j2
new file mode 100644
index 0000000000..c3b0b5f4c4
--- /dev/null
+++ b/files/osbs/dockercfg-staging-secret.j2
@@ -0,0 +1,5 @@
+{"candidate-registry.stg.fedoraproject.org":
+    {"username": {{candidate_registry_osbs_stg_username}},
+     "password": {{candidate_registry_osbs_stg_password}},
+    }
+}
\ No newline at end of file
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 1d94cc6cdb..965767845d 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -394,6 +394,38 @@
       when: env == "production"
       environment: "{{ osbs_environment }}"
 
+- name: Add dockercfg secret to allow registry push
+  hosts: osbs-masters-stg[0]:osbs-masters[0]
+  tags:
+    - osbs-dockercfg-secret
+  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
+      template:
+        src: "{{ files }}/osbs/dockercfg-{{env}}-secret.j2"
+        dest: "/tmp/.dockercfg"
+        mode: 0400
+
+  roles:
+    - role: osbs-secret
+      osbs_secret_name: "v2-registry-dockercfg"
+      osbs_secret_type: kubernetes.io/dockercfg
+      osbs_secret_files:
+      - source: "/tmp/.dockercfg"
+        dest: .dockercfg
+
+  post_tasks:
+    - name: Delete the temporary secret file
+      file:
+        state: absent
+        path: "/tmp/.dockercfg"
+
+
 - name: Create worker namespace
   hosts: osbs-masters-stg[0]
   tags: