Rename manage-container-images and document it.

This commit renames the manage-container-images role
to push-container-registry. It also adds some doc
to describe what the role is used for.

Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-08-24 11:50:56 +02:00
parent 098ccc4075
commit 98632f0049
6 changed files with 20 additions and 23 deletions

View file

@ -64,7 +64,7 @@
service: bodhi service: bodhi
host: "bodhi.stg.fedoraproject.org" host: "bodhi.stg.fedoraproject.org"
when: env == "staging" when: env == "staging"
- role: manage-container-images - role: push-container-registry
cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org" cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org"
cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt" cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt"
key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key" key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key"

View file

@ -295,13 +295,6 @@
candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}", candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}",
when: env == "production" when: env == "production"
} }
- {
role: "manage-container-images",
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 == "staging"
}
handlers: handlers:

View file

@ -54,14 +54,14 @@
tags: tags:
- releng - releng
- { - {
role: "manage-container-images", role: "push-container-registry",
cert_dest_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org", cert_dest_dir: "/etc/docker/certs.d/registry.stg.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 == "staging" when: env == "staging"
} }
- { - {
role: "manage-container-images", role: "push-container-registry",
cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org", cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt", cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt",
key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key", key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key",

View file

@ -1,5 +0,0 @@
---
# defaults file for manage-container-images
#
certs_group: "releng-team"

View file

@ -0,0 +1,5 @@
---
# defaults file for push-container-registry role
#
certs_group: "releng-team"

View file

@ -1,6 +1,10 @@
--- ---
# tasks file for push-docker # tasks file for push-container-registry
# # This role install skopeo and the certificates
# needed to push container images to our production registry.
# Note : push to the candidate-registry is done using docker login
# see the push-docker role.
- name: install necessary packages - name: install necessary packages
package: package:
name: "{{item}}" name: "{{item}}"
@ -8,16 +12,16 @@
with_items: with_items:
- skopeo - skopeo
tags: tags:
- manage-container-images - push-container-registry
- name: ensure cert dir exists - name: ensure cert dir exists
file: file:
path: "{{cert_dest_dir}}" path: "{{cert_dest_dir}}"
state: directory state: directory
tags: tags:
- manage-container-images - push-container-registry
- name: install docker client cert for registry - name: install client cert for registry
copy: copy:
src: "{{cert_src}}" src: "{{cert_src}}"
dest: "{{cert_dest_dir}}/client.cert" dest: "{{cert_dest_dir}}/client.cert"
@ -25,13 +29,13 @@
group: "{{ certs_group }}" group: "{{ certs_group }}"
mode: 0640 mode: 0640
tags: tags:
- manage-container-images - push-container-registry
- name: install docker client key for registry - name: install client key for registry
copy: copy:
src: "{{key_src}}" src: "{{key_src}}"
dest: "{{cert_dest_dir}}/client.key" dest: "{{cert_dest_dir}}/client.key"
group: "{{ certs_group }}" group: "{{ certs_group }}"
mode: 0640 mode: 0640
tags: tags:
- manage-container-images - push-container-registry