From b43e406edd3018560327f8682f2ea1539820b634 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Mon, 17 Dec 2018 13:42:02 +0000 Subject: [PATCH] Alwas use pathless docker mirror URI It seems that we need the pathless docker mirror URI for distro docker now, too, so set it unconditionally. Change-Id: Ic6918312ec60efba0397b85ee16d91c6393ee90b --- roles/install-docker/tasks/mirror.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/roles/install-docker/tasks/mirror.yaml b/roles/install-docker/tasks/mirror.yaml index a80868e4c..17a968666 100644 --- a/roles/install-docker/tasks/mirror.yaml +++ b/roles/install-docker/tasks/mirror.yaml @@ -4,22 +4,13 @@ state: directory path: /etc/docker -- name: Set docker_mirror fact for upstream docker +- name: Set docker_mirror fact when: - docker_mirror is not defined - mirror_fqdn is defined - - use_upstream_docker set_fact: docker_mirror: "http://{{ mirror_fqdn }}:8082" -- 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: