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

update docker registry certs for pushing between registries

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-08-30 19:34:01 +00:00
parent b263125322
commit c27b51cefb
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
playbooks/groups/docker-registry.yml
View file

@ -70,18 +70,21 @@
# Setup compose-x86-01 push docker images to registry # Setup compose-x86-01 push docker images to registry
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerstable"
docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
when: env == "staging", when: env == "staging",
delegate_to: compose-x86-01.phx2.fedoraproject.org delegate_to: compose-x86-01.phx2.fedoraproject.org
} }
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild"
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
when: env == "staging", when: env == "staging",
delegate_to: compose-x86-01.phx2.fedoraproject.org delegate_to: compose-x86-01.phx2.fedoraproject.org
} }
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerstable"
docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
when: env == "production", when: env == "production",
delegate_to: compose-x86-01.phx2.fedoraproject.org delegate_to: compose-x86-01.phx2.fedoraproject.org

2
playbooks/groups/osbs-master.yml
View file

@ -73,11 +73,13 @@
roles: roles:
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild"
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org",
when: env == "staging" when: env == "staging"
} }
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild"
docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org", docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
when: env == "production" when: env == "production"
} }

4
roles/push-docker/tasks/main.yml
View file

@ -11,12 +11,12 @@
- name: install docker client cert for registry - name: install docker client cert for registry
copy: copy:
src: "{{private}}/files/koji/containerbuild.cert.pem" src: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
dest: "{{docker_cert_dir}}/client.cert" dest: "{{docker_cert_dir}}/client.cert"
- name: install docker client key for registry - name: install docker client key for registry
copy: copy:
src: "{{private}}/files/koji/containerbuild.key.pem" src: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
dest: "{{docker_cert_dir}}/client.key" dest: "{{docker_cert_dir}}/client.key"
- name: start and enable docker - name: start and enable docker