Skip to content
Snippets Groups Projects
Unverified Commit 308ceee4 authored by flix444's avatar flix444 Committed by GitHub
Browse files

Valuating conditional (need_https_proxy.rc != 0) fail if http_proxy set and...

Valuating conditional (need_https_proxy.rc != 0) fail if http_proxy set and skip_http_proxy_on_os_packages is true (#7078)

* Remove because of empty need_http_proxy.rc if http/https_proxy and skip_http_proxy_on_os_packages=true is set

* Modify sample for debian and centos skip_http_proxy

* Modify sample for debian and centos skip_http_proxy
parent e0195da8
No related branches found
No related tags found
No related merge requests found
...@@ -70,7 +70,8 @@ loadbalancer_apiserver_healthcheck_port: 8081 ...@@ -70,7 +70,8 @@ loadbalancer_apiserver_healthcheck_port: 8081
## If you need to disable proxying of os package repositories but are still behind an http_proxy set ## If you need to disable proxying of os package repositories but are still behind an http_proxy set
## skip_http_proxy_on_os_packages to true ## skip_http_proxy_on_os_packages to true
## This will cause kubespray not to set proxy environment in /etc/yum.conf for centos ## This will cause kubespray not to set proxy environment in /etc/yum.conf for centos and in /etc/apt/apt.conf for debian/ubuntu
## Special information for debian/ubuntu - you have to set the no_proxy variable, then apt package will install from your source of wish
# skip_http_proxy_on_os_packages: false # skip_http_proxy_on_os_packages: false
## Since workers are included in the no_proxy variable by default, docker engine will be restarted on all nodes (all ## Since workers are included in the no_proxy variable by default, docker engine will be restarted on all nodes (all
......
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
# This command should always run, even in check mode # This command should always run, even in check mode
check_mode: false check_mode: false
environment: {} environment: {}
when:
- http_proxy is defined
- not skip_http_proxy_on_os_packages
- name: Add http_proxy to /etc/apt/apt.conf if http_proxy is defined - name: Add http_proxy to /etc/apt/apt.conf if http_proxy is defined
raw: echo 'Acquire::http::proxy "{{ http_proxy }}";' >> /etc/apt/apt.conf raw: echo 'Acquire::http::proxy "{{ http_proxy }}";' >> /etc/apt/apt.conf
...@@ -41,9 +38,6 @@ ...@@ -41,9 +38,6 @@
# This command should always run, even in check mode # This command should always run, even in check mode
check_mode: false check_mode: false
environment: {} environment: {}
when:
- https_proxy is defined
- not skip_http_proxy_on_os_packages
- name: Add https_proxy to /etc/apt/apt.conf if https_proxy is defined - name: Add https_proxy to /etc/apt/apt.conf if https_proxy is defined
raw: echo 'Acquire::https::proxy "{{ https_proxy }}";' >> /etc/apt/apt.conf raw: echo 'Acquire::https::proxy "{{ https_proxy }}";' >> /etc/apt/apt.conf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment