Browse Source
Support extended settings for the Debian os family (#9943)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pull/9949/head
ERIK
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
18 additions and
7 deletions
-
roles/kubernetes/preinstall/defaults/main.yml
-
roles/kubernetes/preinstall/tasks/0020-set_facts.yml
-
roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
-
roles/kubernetes/preinstall/tasks/main.yml
|
@ -136,3 +136,7 @@ redhat_os_family_extensions: |
|
|
- "openEuler" |
|
|
- "openEuler" |
|
|
- "UnionTech" |
|
|
- "UnionTech" |
|
|
- "UniontechOS" |
|
|
- "UniontechOS" |
|
|
|
|
|
|
|
|
|
|
|
# Extending some distributions into the debian os family |
|
|
|
|
|
debian_os_family_extensions: |
|
|
|
|
|
- "UnionTech OS Server 20" |
|
@ -6,7 +6,7 @@ |
|
|
tags: |
|
|
tags: |
|
|
- facts |
|
|
- 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: |
|
|
set_fact: |
|
|
ansible_os_family: "RedHat" |
|
|
ansible_os_family: "RedHat" |
|
|
ansible_distribution_major_version: "8" |
|
|
ansible_distribution_major_version: "8" |
|
@ -14,6 +14,13 @@ |
|
|
tags: |
|
|
tags: |
|
|
- facts |
|
|
- 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 |
|
|
- name: check if booted with ostree |
|
|
stat: |
|
|
stat: |
|
|
path: /run/ostree-booted |
|
|
path: /run/ostree-booted |
|
@ -5,17 +5,17 @@ |
|
|
- not dns_late |
|
|
- not dns_late |
|
|
- disable_swap |
|
|
- disable_swap |
|
|
|
|
|
|
|
|
- import_tasks: 0020-verify-settings.yml |
|
|
|
|
|
|
|
|
- import_tasks: 0020-set_facts.yml |
|
|
|
|
|
tags: |
|
|
|
|
|
- resolvconf |
|
|
|
|
|
- facts |
|
|
|
|
|
|
|
|
|
|
|
- import_tasks: 0040-verify-settings.yml |
|
|
when: |
|
|
when: |
|
|
- not dns_late |
|
|
- not dns_late |
|
|
tags: |
|
|
tags: |
|
|
- asserts |
|
|
- asserts |
|
|
|
|
|
|
|
|
- import_tasks: 0040-set_facts.yml |
|
|
|
|
|
tags: |
|
|
|
|
|
- resolvconf |
|
|
|
|
|
- facts |
|
|
|
|
|
|
|
|
|
|
|
- import_tasks: 0050-create_directories.yml |
|
|
- import_tasks: 0050-create_directories.yml |
|
|
when: |
|
|
when: |
|
|
- not dns_late |
|
|
- not dns_late |
|
|