C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
flix444 2021-01-06 03:49:51 +01:00 committed by GitHub
parent e0195da80d
commit 308ceee46c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
inventory/sample/group_vars/all/all.yml
View file

@ -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

6
roles/bootstrap-os/tasks/bootstrap-debian.yml
View file

@ -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 @@
# 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