External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-21 21:20:15 -03:30
Code Issues Packages Projects Releases Wiki Activity

bootstrap-os: match on os-release ID / VARIANT_ID (#7269)

Browse Source 
This fixes deployment with CentOS 8 Streams and make detection more reliable

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
This commit is contained in:
Etienne Champetier
2021-02-11 11:14:16 -05:00
committed by GitHub
parent de1d9df787
commit 95b329b64d
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/bootstrap-os/tasks/bootstrap-centos.yml
View File

@@ -22,7 +22,7 @@
dest: /etc/yum.repos.d/public-yum-ol7.repo
when:
- use_oracle_public_repo|default(true)
- '"Oracle" in os_release.stdout'
- '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) < 7.6
environment: "{{ proxy_env }}"
@@ -38,7 +38,7 @@
- ol7_developer_EPEL
when:
- use_oracle_public_repo|default(true)
- '"Oracle" in os_release.stdout'
- '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) < 7.6
- name: Enable Oracle Linux repo
@@ -52,7 +52,7 @@
- { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/x86_64/" }
when:
- use_oracle_public_repo|default(true)
- '"Oracle" in os_release.stdout'
- '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) >= 7.6
- name: Install EPEL for Oracle Linux repo package
@@ -61,7 +61,7 @@
state: present
when:
- use_oracle_public_repo|default(true)
- '"Oracle" in os_release.stdout'
- '''ID="ol"'' in os_release.stdout_lines'
- (ansible_distribution_version | float) >= 7.6
# CentOS ships with python installed