From 308ceee46c0b29c709fc58252d08d313e2611830 Mon Sep 17 00:00:00 2001 From: flix444 Date: Wed, 6 Jan 2021 03:49:51 +0100 Subject: [PATCH] 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 --- inventory/sample/group_vars/all/all.yml | 3 ++- roles/bootstrap-os/tasks/bootstrap-debian.yml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index 2c24e92f4..c9d3766a9 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -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 ## 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 ## Since workers are included in the no_proxy variable by default, docker engine will be restarted on all nodes (all diff --git a/roles/bootstrap-os/tasks/bootstrap-debian.yml b/roles/bootstrap-os/tasks/bootstrap-debian.yml index 484b9a67e..6e2b1d4e3 100644 --- a/roles/bootstrap-os/tasks/bootstrap-debian.yml +++ b/roles/bootstrap-os/tasks/bootstrap-debian.yml @@ -20,9 +20,6 @@ # This command should always run, even in check mode check_mode: false 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 raw: echo 'Acquire::http::proxy "{{ http_proxy }}";' >> /etc/apt/apt.conf @@ -41,9 +38,6 @@ # This command should always run, even in check mode check_mode: false 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 raw: echo 'Acquire::https::proxy "{{ https_proxy }}";' >> /etc/apt/apt.conf