update docker registry certs for pushing between registries

Signed-off-by: Adam Miller <admiller@redhat.com>

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

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"
     }

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