epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 22:04:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Omit does not work in the context of yum_repository proxy. The ansible documentation specifies to use _none_ to disable the global proxy setting. (#4225)

Browse Source
This commit is contained in:
Manuel Cintron
2019-02-12 18:46:32 -06:00
committed by Kubernetes Prow Robot
parent 22a5a00c49
commit 7697baf0da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/bootstrap-os/tasks/bootstrap-centos.yml
View File

@@ -75,7 +75,7 @@
gpgcheck: yes gpgcheck: yes
gpgkey: "{{extras_rh_repo_gpgkey}}" gpgkey: "{{extras_rh_repo_gpgkey}}"
keepcache: "{{ extras_rh_rpm_keepcache | default('1') }}" keepcache: "{{ extras_rh_rpm_keepcache | default('1') }}"
proxy: " {{ http_proxy | default(omit) }}" proxy: " {{ http_proxy | default('_none_') }}"
when: when:
- not is_atomic - not is_atomic
- package_python_httplib2.results | length == 0 - package_python_httplib2.results | length == 0

2
roles/container-engine/docker/tasks/main.yml
View File

@@ -125,7 +125,7 @@
gpgcheck: yes gpgcheck: yes
gpgkey: "{{extras_rh_repo_gpgkey}}" gpgkey: "{{extras_rh_repo_gpgkey}}"
keepcache: "{{ docker_rpm_keepcache | default('1') }}" keepcache: "{{ docker_rpm_keepcache | default('1') }}"
proxy: " {{ http_proxy | default(omit) }}" proxy: " {{ http_proxy | default('_none_') }}"
when: when:
- ansible_distribution in ["CentOS","RedHat"] and not is_atomic - ansible_distribution in ["CentOS","RedHat"] and not is_atomic
- yum_result.results | length == 0 - yum_result.results | length == 0