zuul/zuul-jobs
Code Issues Proposed changes

Merge "Don't write docker proxy config if docker_mirror undef"

Browse Source
This commit is contained in:
Zuul 2018-07-16 19:50:32 +00:00 committed by Gerrit Code Review
commit 5b8b6bc5c2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/install-docker/tasks/mirror.yaml
View File

@ -7,6 +7,7 @@
- name: Set docker_mirror fact for upstream docker - name: Set docker_mirror fact for upstream docker
when: when:
- docker_mirror is not defined - docker_mirror is not defined
- mirror_fqdn is defined
- use_upstream_docker - use_upstream_docker
set_fact: set_fact:
docker_mirror: "http://{{ mirror_fqdn }}:8082" docker_mirror: "http://{{ mirror_fqdn }}:8082"
@ -14,12 +15,15 @@
- name: Set docker_mirror fact for distro docker - name: Set docker_mirror fact for distro docker
when: when:
- docker_mirror is not defined - docker_mirror is not defined
- mirror_fqdn is defined
- not use_upstream_docker - not use_upstream_docker
set_fact: set_fact:
docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/" docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/"
- name: Install dockerhub proxy configuration - name: Install dockerhub proxy configuration
become: yes become: yes
when:
- docker_mirror is defined
template: template:
dest: /etc/docker/daemon.json dest: /etc/docker/daemon.json
group: root group: root