From 9fdda7eca8b7b47a7cb980ec57cb8030ea3c7b3a Mon Sep 17 00:00:00 2001
From: ERIK <bo.jiang@daocloud.io>
Date: Fri, 21 Oct 2022 19:53:51 +0800
Subject: [PATCH] Fix iputils install failure in Kylin OS (#9416)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
---
roles/bootstrap-os/tasks/main.yml | 8 ++++++++
roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index a5ed5dc96..5b98d59d3 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -84,6 +84,14 @@
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/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
index a69cb4b7f..58e0685a2 100644
--- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
+++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
@@ -6,14 +6,6 @@
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
--
GitLab