diff --git a/cluster.yml b/cluster.yml index ebc093a21..bc0580331 100644 --- a/cluster.yml +++ b/cluster.yml @@ -26,19 +26,6 @@ - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} -- hosts: k8s-cluster:etcd:calico-rr - any_errors_fatal: "{{ any_errors_fatal | default(true) }}" - vars: - ansible_ssh_pipelining: true - gather_facts: false - pre_tasks: - - name: gather facts from all instances - setup: - delegate_to: "{{ item }}" - delegate_facts: true - with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr']|default([]) }}" - run_once: true - - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: diff --git a/extra_playbooks/upgrade-only-k8s.yml b/extra_playbooks/upgrade-only-k8s.yml index ce3927f09..db66982cd 100644 --- a/extra_playbooks/upgrade-only-k8s.yml +++ b/extra_playbooks/upgrade-only-k8s.yml @@ -27,12 +27,6 @@ - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} -- hosts: k8s-cluster:etcd:calico-rr - any_errors_fatal: "{{ any_errors_fatal | default(true) }}" - vars: - ansible_ssh_pipelining: true - gather_facts: true - - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: diff --git a/scale.yml b/scale.yml index c7f3dfd31..094be2a15 100644 --- a/scale.yml +++ b/scale.yml @@ -27,13 +27,6 @@ - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} -- name: Gather facts about our masters and etcd nodes - hosts: k8s-cluster:etcd:calico-rr - any_errors_fatal: "{{ any_errors_fatal | default(true) }}" - vars: - ansible_ssh_pipelining: true - gather_facts: true - - name: Generate the etcd certificates beforehand hosts: etcd any_errors_fatal: "{{ any_errors_fatal | default(true) }}" diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index 1ba298e69..a5b2bf781 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -30,18 +30,6 @@ - { role: kubespray-defaults} - { role: bootstrap-os, tags: bootstrap-os} -- hosts: k8s-cluster:etcd:calico-rr - any_errors_fatal: "{{ any_errors_fatal | default(true) }}" - vars: - ansible_ssh_pipelining: true - gather_facts: true - pre_tasks: - - name: gather facts from all instances - setup: - delegate_to: "{{ item }}" - delegate_facts: True - with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr']|default([]) }}" - - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" serial: "{{ serial | default('20%') }}"