C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure when use_oracle_public_repo is set to false the public Oracle Linux yum repos are not set (#7228)

Browse source 
(cherry picked from commit b70d986bfa)
This commit is contained in:
Sander Cornelissen 2021-01-29 12:59:41 +01:00 committed by Kubernetes Prow Robot
parent 3725c80a71
commit 6bde4e3fb3
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/bootstrap-os/tasks/bootstrap-centos.yml
View file

@ -51,6 +51,7 @@
- { option: "enabled", value: "1" } - { option: "enabled", value: "1" }
- { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/x86_64/" } - { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/x86_64/" }
when: when:
- use_oracle_public_repo|default(true)
- '"Oracle" in os_release.stdout' - '"Oracle" in os_release.stdout'
- (ansible_distribution_version | float) >= 7.6 - (ansible_distribution_version | float) >= 7.6
@ -59,6 +60,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)
- '"Oracle" in os_release.stdout' - '"Oracle" in os_release.stdout'
- (ansible_distribution_version | float) >= 7.6 - (ansible_distribution_version | float) >= 7.6