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

use basic auth to authenticate against the candidate registry

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-06-08 11:49:04 +02:00
parent d89298457c
commit ea3bcfa284
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,13 +124,9 @@
role: push-docker, role: push-docker,
docker_cert_name: "containerstable", 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", candidate_registry: "candidate-registry.stg.fedoraproject.org",
delegate_to: compose-x86-01.phx2.fedoraproject.org candidate_registry_osbs_username: "{{candidate_registry_osbs_staging_username}}",
} candidate_registry_osbs_password: "{{candidate_registry_osbs_staging_password}}"
- {
role: push-docker,
docker_cert_name: "containerbuild",
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
} }
@ -138,13 +134,9 @@
role: push-docker, role: push-docker,
docker_cert_name: "containerstable", 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", candidate_registry: "candidate-registry.fedoraproject.org",
delegate_to: compose-x86-01.phx2.fedoraproject.org candidate_registry_osbs_username: "{{candidate_registry_osbs_production_username}}",
} candidate_registry_osbs_password: "{{candidate_registry_osbs_production_password}}"
- {
role: push-docker,
docker_cert_name: "containerbuild",
docker_cert_dir: "/etc/docker/certs.d/candidate-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
} }

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

@ -274,8 +274,9 @@
} }
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild", candidate_registry: "{{docker_registry}}",
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org", candidate_registry_osbs_username: "{{candidate_registry_osbs_staging_username}}",
candidate_registry_osbs_password: "{{candidate_registry_osbs_staging_password}}"
when: env == "staging" when: env == "staging"
} }
- { - {
@ -294,8 +295,9 @@
} }
- { - {
role: push-docker, role: push-docker,
docker_cert_name: "containerbuild", candidate_registry: "{{docker_registry}}",
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org", candidate_registry_osbs_username: "{{candidate_registry_osbs_production_username}}",
candidate_registry_osbs_password: "{{candidate_registry_osbs_production_password}}"
when: env == "production" when: env == "production"
} }

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

@ -16,6 +16,7 @@
owner: root owner: root
group: "releng-team" group: "releng-team"
mode: 0640 mode: 0640
when: docker_cert_name is defined
- name: install docker client key for registry - name: install docker client key for registry
copy: copy:
@ -24,6 +25,13 @@
owner: root owner: root
group: "releng-team" group: "releng-team"
mode: 0640 mode: 0640
when: docker_cert_name is defined
- name: Log into the candidate-registry
docker_login:
registry: "{{candidate_registry}}"
username: "{{candidate_registry_osbs_username}}"
password: "{{candidate_registry_osbs_password}}"
- name: start and enable docker - name: start and enable docker
service: name=docker state=started enabled=yes service: name=docker state=started enabled=yes