From b640d5c97ac9d727100a8f463ff3ec0548b0e6b2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 16 Jul 2018 12:46:44 -0500 Subject: [PATCH] Don't write docker proxy config if docker_mirror undef If docker_mirror isn't set, we set one. But if we do it when mirror_fqdn isn't set, we get a bogus value. Put in guards for that so that we don't write out bad values. Change-Id: Ie56d9a83fbabcc99420ce28a8a8f1bb562db0470 --- roles/install-docker/tasks/mirror.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/install-docker/tasks/mirror.yaml b/roles/install-docker/tasks/mirror.yaml index 16820fef5..a80868e4c 100644 --- a/roles/install-docker/tasks/mirror.yaml +++ b/roles/install-docker/tasks/mirror.yaml @@ -7,6 +7,7 @@ - name: Set docker_mirror fact for upstream docker when: - docker_mirror is not defined + - mirror_fqdn is defined - use_upstream_docker set_fact: docker_mirror: "http://{{ mirror_fqdn }}:8082" @@ -14,12 +15,15 @@ - name: Set docker_mirror fact for distro docker when: - docker_mirror is not defined + - mirror_fqdn is defined - not use_upstream_docker set_fact: docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/" - name: Install dockerhub proxy configuration become: yes + when: + - docker_mirror is defined template: dest: /etc/docker/daemon.json group: root