From c27b51cefb14c4bd9f2c1e6141cb352f307093e4 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Tue, 30 Aug 2016 19:34:01 +0000
Subject: [PATCH] update docker registry certs for pushing between registries

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 playbooks/groups/docker-registry.yml | 3 +++
 playbooks/groups/osbs-master.yml     | 2 ++
 roles/push-docker/tasks/main.yml     | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index 91e19754cb..5a75ff814c 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -70,18 +70,21 @@
     # Setup compose-x86-01 push docker images to registry
     - {
       role: push-docker,
+        docker_cert_name: "containerstable"
         docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
       when: env == "staging",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
     - {
       role: push-docker,
+        docker_cert_name: "containerbuild"
         docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
       when: env == "staging",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
     - {
       role: push-docker,
+        docker_cert_name: "containerstable"
         docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
       when: env == "production",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 40fae39df5..c72822c06c 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -73,11 +73,13 @@
   roles:
     - {
       role: push-docker,
+        docker_cert_name: "containerbuild"
         docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
       when: env == "staging"
     }
     - {
       role: push-docker,
+        docker_cert_name: "containerbuild"
         docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
       when: env == "production"
     }
diff --git a/roles/push-docker/tasks/main.yml b/roles/push-docker/tasks/main.yml
index 204c0bfd4e..9baad7f168 100644
--- a/roles/push-docker/tasks/main.yml
+++ b/roles/push-docker/tasks/main.yml
@@ -11,12 +11,12 @@
 
 - name: install docker client cert for registry
   copy:
-    src: "{{private}}/files/koji/containerbuild.cert.pem"
+    src: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
     dest: "{{docker_cert_dir}}/client.cert"
 
 - name: install docker client key for registry
   copy:
-    src: "{{private}}/files/koji/containerbuild.key.pem"
+    src: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
     dest: "{{docker_cert_dir}}/client.key"
 
 - name: start and enable docker