From 7697baf0da5d728120e2b6327444c694bdb28a98 Mon Sep 17 00:00:00 2001
From: Manuel Cintron <4176113+mcntrn@users.noreply.github.com>
Date: Tue, 12 Feb 2019 18:46:32 -0600
Subject: [PATCH] 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)
---
roles/bootstrap-os/tasks/bootstrap-centos.yml | 2 +-
roles/container-engine/docker/tasks/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/bootstrap-os/tasks/bootstrap-centos.yml b/roles/bootstrap-os/tasks/bootstrap-centos.yml
index bd5783355..7f5d641f8 100644
--- a/roles/bootstrap-os/tasks/bootstrap-centos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-centos.yml
@@ -75,7 +75,7 @@
gpgcheck: yes
gpgkey: "{{extras_rh_repo_gpgkey}}"
keepcache: "{{ extras_rh_rpm_keepcache | default('1') }}"
- proxy: " {{ http_proxy | default(omit) }}"
+ proxy: " {{ http_proxy | default('_none_') }}"
when:
- not is_atomic
- package_python_httplib2.results | length == 0
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index 8dde643d4..150366fc4 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -125,7 +125,7 @@
gpgcheck: yes
gpgkey: "{{extras_rh_repo_gpgkey}}"
keepcache: "{{ docker_rpm_keepcache | default('1') }}"
- proxy: " {{ http_proxy | default(omit) }}"
+ proxy: " {{ http_proxy | default('_none_') }}"
when:
- ansible_distribution in ["CentOS","RedHat"] and not is_atomic
- yum_result.results | length == 0
--
GitLab