External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 09:38:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1891 from rsmitty/proxy-fixes

Browse Source 
Improved proxy support
This commit is contained in:
Spencer Smith
2017-10-31 14:32:12 -04:00
committed by GitHub
parent 8412181746 74a9eedb93
commit ef0a91da27
9 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/tasks/main.yml
View File

@@ -40,7 +40,6 @@
until: keyserver_task_result|succeeded
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
environment: "{{ proxy_env }}"
with_items: "{{ docker_repo_key_info.repo_keys }}"
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic)
@@ -68,7 +67,6 @@
until: docker_task_result|succeeded
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
environment: "{{ proxy_env }}"
with_items: "{{ docker_package_info.pkgs }}"
notify: restart docker
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0)