From e135cd71834d6ca0a8d6bfd15ee9a70aa6bb56a8 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Thu, 5 Jul 2018 15:12:25 +0200 Subject: [PATCH] Make the manage-container-images role generic for stg and prod Signed-off-by: Clement Verna --- playbooks/groups/osbs-cluster.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index eb4eeafe47..f923fc1f1a 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -282,13 +282,6 @@ candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}", when: env == "staging" } - - { - role: "manage-container-images", - cert_dest_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org", - cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem", - key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key", - when: env == "staging" - } - { role: push-docker, candidate_registry: "{{docker_registry}}", @@ -298,10 +291,9 @@ } - { role: "manage-container-images", - cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org", + cert_dest_dir: "/etc/docker/certs.d/candidate-registry{{ env_suffix }}.fedoraproject.org", cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem", key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key", - when: env == "production" }