diff --git a/roles/kubernetes/control-plane/meta/main.yml b/roles/kubernetes/control-plane/meta/main.yml index ceb05687d83..0387a6357c8 100644 --- a/roles/kubernetes/control-plane/meta/main.yml +++ b/roles/kubernetes/control-plane/meta/main.yml @@ -5,6 +5,6 @@ dependencies: user: "{{ addusers.etcd }}" when: - etcd_deployment_type == "kubeadm" - - not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos) + - not (ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos) - role: network_plugin/calico_defaults - role: etcd_defaults diff --git a/roles/kubernetes/control-plane/tasks/main.yml b/roles/kubernetes/control-plane/tasks/main.yml index f8ebd9dd247..0fc11336d7c 100644 --- a/roles/kubernetes/control-plane/tasks/main.yml +++ b/roles/kubernetes/control-plane/tasks/main.yml @@ -68,7 +68,7 @@ - name: Install kubectl bash completion shell: "{{ bin_dir }}/kubectl completion bash >/etc/bash_completion.d/kubectl.sh" - when: ansible_os_family in ["Debian","RedHat", "Suse"] + when: ansible_facts['os_family'] in ["Debian","RedHat", "Suse"] tags: - kubectl ignore_errors: true # noqa ignore-errors @@ -79,7 +79,7 @@ owner: root group: root mode: "0755" - when: ansible_os_family in ["Debian","RedHat", "Suse"] + when: ansible_facts['os_family'] in ["Debian","RedHat", "Suse"] tags: - kubectl - upgrade @@ -98,7 +98,7 @@ state: present marker: "# Ansible entries {mark}" when: - - ansible_os_family in ["Debian","RedHat", "Suse"] + - ansible_facts['os_family'] in ["Debian","RedHat", "Suse"] - kubectl_alias is defined and kubectl_alias != "" tags: - kubectl diff --git a/roles/kubernetes/node/tasks/facts.yml b/roles/kubernetes/node/tasks/facts.yml index 6e8995274cb..ab746935c7f 100644 --- a/roles/kubernetes/node/tasks/facts.yml +++ b/roles/kubernetes/node/tasks/facts.yml @@ -54,9 +54,9 @@ include_vars: "{{ item }}" with_first_found: - files: - - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower | replace('/', '_') }}.yml" - - "{{ ansible_distribution | lower }}-{{ ansible_distribution_release }}.yml" - - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower | replace('/', '_') }}.yml" - - "{{ ansible_distribution | lower }}.yml" - - "{{ ansible_os_family | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower | replace('/', '_') }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_release'] }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower | replace('/', '_') }}.yml" + - "{{ ansible_facts['distribution'] | lower }}.yml" + - "{{ ansible_facts['os_family'] | lower }}.yml" skip: true