Skip to content

Commit

Permalink
[2.13] add missing 'Set up proxy environment' tasks (#6591)
Browse files Browse the repository at this point in the history
* Add proxy_env calculation to reset.yml (#6558)

* * add proxy_env definition to remove_node.yml resolving #6430 (#6431)

Co-authored-by: Florian Ruynat <florian234@hotmail.com>
Co-authored-by: nniehoff <github@nickniehoff.net>
  • Loading branch information
3 people authored Sep 17, 2020
1 parent 8e53d81 commit f4b6bce
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
15 changes: 15 additions & 0 deletions remove-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 15 additions & 0 deletions reset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit f4b6bce

Please sign in to comment.