Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Make the manage-container-images role generic for stg and prod

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-07-05 15:12:25 +02:00
parent 1bcac6b80e
commit e135cd7183
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
playbooks/groups/osbs-cluster.yml
View file

@ -282,13 +282,6 @@
candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}", candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
when: env == "staging" 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, role: push-docker,
candidate_registry: "{{docker_registry}}", candidate_registry: "{{docker_registry}}",
@ -298,10 +291,9 @@
} }
- { - {
role: "manage-container-images", 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", cert_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.pem",
key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key", key_src: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key",
when: env == "production"
} }