From 40261fdf1477c82c58b6ab1b7c4809eca17813bb Mon Sep 17 00:00:00 2001 From: ERIK Date: Mon, 7 Nov 2022 09:54:16 +0800 Subject: [PATCH] Fix iputils install failure in Kylin OS (#9453) Signed-off-by: bo.jiang Signed-off-by: bo.jiang --- roles/bootstrap-os/tasks/main.yml | 8 -------- .../kubernetes/preinstall/tasks/0020-verify-settings.yml | 6 +++--- roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml index 7ce82e686..fbd15713a 100644 --- a/roles/bootstrap-os/tasks/main.yml +++ b/roles/bootstrap-os/tasks/main.yml @@ -84,14 +84,6 @@ or is_fedora_coreos or ansible_distribution == "Fedora") -- name: Set os_family fact for Kylin Linux Advanced Server - set_fact: - ansible_os_family: "RedHat" - ansible_distribution_major_version: "8" - when: ansible_distribution == "Kylin Linux Advanced Server" - tags: - - facts - - name: Install ceph-commmon package package: name: diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml index b450a4ef9..4705be9c6 100644 --- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml @@ -103,10 +103,10 @@ - name: Ensure ping package package: name: >- - {%- if ansible_os_family in ['RedHat', 'Suse'] -%} - iputils - {%- else -%} + {%- if ansible_os_family == 'Debian' -%} iputils-ping + {%- else -%} + iputils {%- endif -%} state: present when: diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml index e6148ace1..54aa5b6dc 100644 --- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml @@ -6,6 +6,14 @@ tags: - facts +- name: Set os_family fact for Kylin Linux Advanced Server + set_fact: + ansible_os_family: "RedHat" + ansible_distribution_major_version: "8" + when: ansible_distribution == "Kylin Linux Advanced Server" + tags: + - facts + - name: check if booted with ostree stat: path: /run/ostree-booted