summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Harbott <j.harbott@x-ion.de>2018-12-17 13:42:02 +0000
committerJens Harbott <j.harbott@x-ion.de>2018-12-17 13:42:02 +0000
commitb43e406edd3018560327f8682f2ea1539820b634 (patch)
treeebca5a841d5ed8d1470e2fb740bf7d177a913730
parent68375810eea1b4e4bf4e6eee08aa3efc02df289f (diff)
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
Notes
Notes (review): Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+1: Jean-Philippe Evrard <jean-philippe@evrard.me> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 17 Dec 2018 16:07:26 +0000 Reviewed-on: https://review.openstack.org/625596 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/install-docker/tasks/mirror.yaml11
1 files changed, 1 insertions, 10 deletions
diff --git a/roles/install-docker/tasks/mirror.yaml b/roles/install-docker/tasks/mirror.yaml
index a80868e..17a9686 100644
--- a/roles/install-docker/tasks/mirror.yaml
+++ b/roles/install-docker/tasks/mirror.yaml
@@ -4,22 +4,13 @@
4 state: directory 4 state: directory
5 path: /etc/docker 5 path: /etc/docker
6 6
7- name: Set docker_mirror fact for upstream docker 7- name: Set docker_mirror fact
8 when: 8 when:
9 - docker_mirror is not defined 9 - docker_mirror is not defined
10 - mirror_fqdn is defined 10 - mirror_fqdn is defined
11 - use_upstream_docker
12 set_fact: 11 set_fact:
13 docker_mirror: "http://{{ mirror_fqdn }}:8082" 12 docker_mirror: "http://{{ mirror_fqdn }}:8082"
14 13
15- name: Set docker_mirror fact for distro docker
16 when:
17 - docker_mirror is not defined
18 - mirror_fqdn is defined
19 - not use_upstream_docker
20 set_fact:
21 docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/"
22
23- name: Install dockerhub proxy configuration 14- name: Install dockerhub proxy configuration
24 become: yes 15 become: yes
25 when: 16 when: