Browse Source
Fix iputils install failure in Kylin OS (#9453)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pull/9367/head
ERIK
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
11 additions and
11 deletions
-
roles/bootstrap-os/tasks/main.yml
-
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
-
roles/kubernetes/preinstall/tasks/0040-set_facts.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: |
|
|
|
|
|
@ -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: |
|
|
|
|
|
@ -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 |
|
|
|