Skip to content

Commit

Permalink
Support extended settings for the Debian os family (#9943)
Browse files Browse the repository at this point in the history
Signed-off-by: bo.jiang <[email protected]>
  • Loading branch information
ErikJiang authored Mar 31, 2023
1 parent 3a60699 commit 0c4f57a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
4 changes: 4 additions & 0 deletions roles/kubernetes/preinstall/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,7 @@ redhat_os_family_extensions:
- "openEuler"
- "UnionTech"
- "UniontechOS"

# Extending some distributions into the debian os family
debian_os_family_extensions:
- "UnionTech OS Server 20"
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@
tags:
- facts

- name: Set os_family fact for Kylin Linux Advanced Server and openEuler
- name: Set os_family fact for other redhat-based operating systems
set_fact:
ansible_os_family: "RedHat"
ansible_distribution_major_version: "8"
when: ansible_distribution in redhat_os_family_extensions
tags:
- facts

- name: Set os_family fact for other debian-based operating systems
set_fact:
ansible_os_family: "Debian"
when: ansible_distribution in debian_os_family_extensions
tags:
- facts

- name: check if booted with ostree
stat:
path: /run/ostree-booted
Expand Down
12 changes: 6 additions & 6 deletions roles/kubernetes/preinstall/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
- not dns_late
- disable_swap

- import_tasks: 0020-verify-settings.yml
- import_tasks: 0020-set_facts.yml
tags:
- resolvconf
- facts

- import_tasks: 0040-verify-settings.yml
when:
- not dns_late
tags:
- asserts

- import_tasks: 0040-set_facts.yml
tags:
- resolvconf
- facts

- import_tasks: 0050-create_directories.yml
when:
- not dns_late
Expand Down

0 comments on commit 0c4f57a

Please sign in to comment.