From 4cb5a4f609654d66d0518cb877f7c5cd8868ae4f Mon Sep 17 00:00:00 2001 From: holmesb <5072156+holmesb@users.noreply.github.com> Date: Sun, 11 Oct 2020 16:50:47 +0100 Subject: [PATCH] Fix line-spacing in no_proxy.yml (#6810) Signed-off-by: holmesb <5072156+holmesb@users.noreply.github.com> --- roles/kubespray-defaults/tasks/no_proxy.yml | 76 ++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/roles/kubespray-defaults/tasks/no_proxy.yml b/roles/kubespray-defaults/tasks/no_proxy.yml index 07098c674..5af4cc068 100755 --- a/roles/kubespray-defaults/tasks/no_proxy.yml +++ b/roles/kubespray-defaults/tasks/no_proxy.yml @@ -1,38 +1,38 @@ ---- -- name: Set no_proxy to all assigned cluster IPs and hostnames - set_fact: - no_proxy_prepare: >- - {%- if loadbalancer_apiserver is defined -%} - {{ apiserver_loadbalancer_domain_name| default('') }}, - {{ loadbalancer_apiserver.address | default('') }}, - {%- endif -%} - {%- if ( (no_proxy_exclude_workers is defined) and (no_proxy_exclude_workers) ) -%} - {% set cluster_or_master = 'kube-master' %} - {% else %} - {% set cluster_or_master = 'k8s-cluster' %} - {% endif %} - {%- for item in (groups[cluster_or_master] + groups['etcd'] + groups['calico-rr']|default([]))|unique -%} - {{ hostvars[item]['access_ip'] | default(hostvars[item]['ip'] | default(fallback_ips[item])) }}, - {%- if item != hostvars[item].get('ansible_hostname', '') -%} - {{ hostvars[item]['ansible_hostname'] }}, - {{ hostvars[item]['ansible_hostname'] }}.{{ dns_domain }}, - {%- endif -%} - {{ item }},{{ item }}.{{ dns_domain }}, - {%- endfor -%} - {%- if additional_no_proxy is defined -%} - {{ additional_no_proxy }}, - {%- endif -%} - 127.0.0.1,localhost,{{ kube_service_addresses }},{{ kube_pods_subnet }} - delegate_to: localhost - connection: local - delegate_facts: yes - become: no - run_once: yes - -- name: Populates no_proxy to all hosts - set_fact: - no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}" - proxy_env: "{{ proxy_env | combine({ - 'no_proxy': hostvars.localhost.no_proxy_prepare, - 'NO_PROXY': hostvars.localhost.no_proxy_prepare - }) }}" +--- +- name: Set no_proxy to all assigned cluster IPs and hostnames + set_fact: + no_proxy_prepare: >- + {%- if loadbalancer_apiserver is defined -%} + {{ apiserver_loadbalancer_domain_name| default('') }}, + {{ loadbalancer_apiserver.address | default('') }}, + {%- endif -%} + {%- if ( (no_proxy_exclude_workers is defined) and (no_proxy_exclude_workers) ) -%} + {% set cluster_or_master = 'kube-master' %} + {% else %} + {% set cluster_or_master = 'k8s-cluster' %} + {% endif %} + {%- for item in (groups[cluster_or_master] + groups['etcd'] + groups['calico-rr']|default([]))|unique -%} + {{ hostvars[item]['access_ip'] | default(hostvars[item]['ip'] | default(fallback_ips[item])) }}, + {%- if item != hostvars[item].get('ansible_hostname', '') -%} + {{ hostvars[item]['ansible_hostname'] }}, + {{ hostvars[item]['ansible_hostname'] }}.{{ dns_domain }}, + {%- endif -%} + {{ item }},{{ item }}.{{ dns_domain }}, + {%- endfor -%} + {%- if additional_no_proxy is defined -%} + {{ additional_no_proxy }}, + {%- endif -%} + 127.0.0.1,localhost,{{ kube_service_addresses }},{{ kube_pods_subnet }} + delegate_to: localhost + connection: local + delegate_facts: yes + become: no + run_once: yes + +- name: Populates no_proxy to all hosts + set_fact: + no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}" + proxy_env: "{{ proxy_env | combine({ + 'no_proxy': hostvars.localhost.no_proxy_prepare, + 'NO_PROXY': hostvars.localhost.no_proxy_prepare + }) }}"