External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-04-09 12:09:23 -02:30
Code Issues Packages Projects Releases Wiki Activity

Refactor(defaults): centralize bootstrap_os defaults (#13155)

Browse Source
This commit is contained in:
Yang-Ming Lin
2026-04-09 11:05:38 +08:00
committed by GitHub
parent f0c965f1ed
commit 00a0479078
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/bootstrap_os/defaults/main.yml
View File

@@ -20,6 +20,10 @@ openeuler_metalink_enabled: false
# Install public repo on Oracle Linux # Install public repo on Oracle Linux
use_oracle_public_repo: true use_oracle_public_repo: true
## RHEL specific variables
# Enable RHEL subscription repos
rhel_enable_repos: true
## Ubuntu specific variables ## Ubuntu specific variables
# Disable unattended-upgrades for Linux kernel and all packages start with linux- on Ubuntu # Disable unattended-upgrades for Linux kernel and all packages start with linux- on Ubuntu
ubuntu_kernel_unattended_upgrades_disabled: false ubuntu_kernel_unattended_upgrades_disabled: false

6
roles/bootstrap_os/tasks/centos.yml
View File

@@ -23,7 +23,7 @@
name: "oracle-epel-release-el{{ ansible_distribution_major_version }}" name: "oracle-epel-release-el{{ ansible_distribution_major_version }}"
state: present state: present
when: when:
- use_oracle_public_repo | default(true) - use_oracle_public_repo
- '''ID="ol"'' in os_release.stdout_lines' - '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) >= 7.6 - (ansible_distribution_version | float) >= 7.6
@@ -39,7 +39,7 @@
- { option: "enabled", value: "1" } - { option: "enabled", value: "1" }
- { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/$basearch/" } - { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/$basearch/" }
when: when:
- use_oracle_public_repo | default(true) - use_oracle_public_repo
- '''ID="ol"'' in os_release.stdout_lines' - '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) >= 7.6 - (ansible_distribution_version | float) >= 7.6
@@ -56,7 +56,7 @@
- { option: "gpgcheck", value: "0" } - { option: "gpgcheck", value: "0" }
- { option: "baseurl", value: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/os/" } - { option: "baseurl", value: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/os/" }
when: when:
- use_oracle_public_repo | default(true) - use_oracle_public_repo
- '''ID="ol"'' in os_release.stdout_lines' - '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) >= 7.6 - (ansible_distribution_version | float) >= 7.6
- (ansible_distribution_version | float) < 9 - (ansible_distribution_version | float) < 9

2
roles/bootstrap_os/tasks/rhel.yml
View File

@@ -69,7 +69,7 @@
name: name:
- "rhel-8-for-*-baseos-rpms" - "rhel-8-for-*-baseos-rpms"
- "rhel-8-for-*-appstream-rpms" - "rhel-8-for-*-appstream-rpms"
state: "{{ 'enabled' if (rhel_enable_repos | default(True) | bool) else 'disabled' }}" state: "{{ 'enabled' if (rhel_enable_repos | bool) else 'disabled' }}"
when: when:
- ansible_distribution_major_version == "8" - ansible_distribution_major_version == "8"
- (not rh_subscription_status.changed) or (rh_subscription_username is defined) or (rh_subscription_org_id is defined) - (not rh_subscription_status.changed) or (rh_subscription_username is defined) or (rh_subscription_org_id is defined)