diff options
| author | Adam Miller <admiller@redhat.com> | 2017-04-10 21:34:46 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-04-10 21:34:46 +0000 |
| commit | 19bd3aa2e313d33fe1c18e85b5269de21b6b2bc8 (patch) | |
| tree | 609b680bd94e7e4d18724106b6cfec78ab93d4c2 | |
| parent | 5c38199cc8ace67f7a8672259ecaa4eb70bf5ad2 (diff) | |
| download | ansible-19bd3aa2e313d33fe1c18e85b5269de21b6b2bc8.tar.gz ansible-19bd3aa2e313d33fe1c18e85b5269de21b6b2bc8.tar.xz ansible-19bd3aa2e313d33fe1c18e85b5269de21b6b2bc8.zip | |
add manage-container-images for stg registries
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | playbooks/groups/osbs-cluster.yml | 7 | ||||
| -rw-r--r-- | playbooks/groups/releng-compose.yml | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index c667d07c3..f286510a3 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -258,6 +258,13 @@ when: env == "staging" } - { + role: "manage-container-images", + cert_dest_dir: "/etc/docker/certs.d/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, docker_cert_name: "containerbuild", docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org", diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 5d731035a..2db709b35 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -48,6 +48,20 @@ - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" } - fedmsg/base - releng + - { + role: "manage-container-images", + cert_dest_dir: "/etc/docker/certs.d/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: "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" + } tasks: # this is how you include other task lists |