C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix iputils install failure in Kylin OS (#9453)

Browse source 
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
This commit is contained in:
ERIK 2022-11-07 09:54:16 +08:00 committed by GitHub
parent 590b4aa240
commit 40261fdf14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/bootstrap-os/tasks/main.yml
View file

@ -84,14 +84,6 @@
or is_fedora_coreos or is_fedora_coreos
or ansible_distribution == "Fedora") 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 - name: Install ceph-commmon package
package: package:
name: name:

6
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View file

@ -103,10 +103,10 @@
- name: Ensure ping package - name: Ensure ping package
package: package:
name: >- name: >-
{%- if ansible_os_family in ['RedHat', 'Suse'] -%} {%- if ansible_os_family == 'Debian' -%}
iputils
{%- else -%}
iputils-ping iputils-ping
{%- else -%}
iputils
{%- endif -%} {%- endif -%}
state: present state: present
when: when:

8
roles/kubernetes/preinstall/tasks/0040-set_facts.yml
View file

@ -6,6 +6,14 @@
tags: tags:
- facts - 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 - name: check if booted with ostree
stat: stat:
path: /run/ostree-booted path: /run/ostree-booted