From f4b6bce69fb5c1739aafee08b13d15c8bc54850a Mon Sep 17 00:00:00 2001 From: ahmadali shafiee Date: Thu, 17 Sep 2020 14:16:45 +0430 Subject: [PATCH] [2.13] add missing 'Set up proxy environment' tasks (#6591) * Add proxy_env calculation to reset.yml (#6558) * * add proxy_env definition to remove_node.yml resolving #6430 (#6431) Co-authored-by: Florian Ruynat Co-authored-by: nniehoff --- remove-node.yml | 15 +++++++++++++++ reset.yml | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/remove-node.yml b/remove-node.yml index ee6956dcc..c8fd89701 100644 --- a/remove-node.yml +++ b/remove-node.yml @@ -2,6 +2,21 @@ - name: Check ansible version import_playbook: ansible_version.yml +- hosts: all + gather_facts: false + tags: always + tasks: + - name: "Set up proxy environment" + set_fact: + proxy_env: + http_proxy: "{{ http_proxy | default ('') }}" + HTTP_PROXY: "{{ http_proxy | default ('') }}" + https_proxy: "{{ https_proxy | default ('') }}" + HTTPS_PROXY: "{{ https_proxy | default ('') }}" + no_proxy: "{{ no_proxy | default ('') }}" + NO_PROXY: "{{ no_proxy | default ('') }}" + no_log: true + - hosts: "{{ node | default('etcd:k8s-cluster:calico-rr') }}" gather_facts: no vars_prompt: diff --git a/reset.yml b/reset.yml index cf64c2f34..502aff0df 100644 --- a/reset.yml +++ b/reset.yml @@ -2,6 +2,21 @@ - name: Check ansible version import_playbook: ansible_version.yml +- hosts: all + gather_facts: false + tags: always + tasks: + - name: "Set up proxy environment" + set_fact: + proxy_env: + http_proxy: "{{ http_proxy | default ('') }}" + HTTP_PROXY: "{{ http_proxy | default ('') }}" + https_proxy: "{{ https_proxy | default ('') }}" + HTTPS_PROXY: "{{ https_proxy | default ('') }}" + no_proxy: "{{ no_proxy | default ('') }}" + NO_PROXY: "{{ no_proxy | default ('') }}" + no_log: true + - hosts: bastion[0] gather_facts: False roles: