Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kubespray
Commits
bcf69591
Unverified
Commit
bcf69591
authored
3 years ago
by
Florian Ruynat
Committed by
GitHub
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix Oracle yum disabled repository file after EPEL install (#7639)
parent
23cd1d41
master
dev-2.18
floryut-patch-1
ops-2.18
ph-dev
pre-commit-hook
release-2.16
release-2.17
release-2.18
release-2.19
release-2.20
revert-8001-disable_etcd_v2_api
revert-8244-remove_kubeadm_config_endpoints
revert-8299-feature/fix-external-lb-error
v2.20.0
v2.19.1
v2.19.0
v2.18.2
v2.18.1
v2.18.0
v2.17.1
v2.17.0
v2.16.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/bootstrap-os/tasks/bootstrap-centos.yml
+10
-9
roles/bootstrap-os/tasks/bootstrap-centos.yml
with
10 additions
and
9 deletions
+10
-9
roles/bootstrap-os/tasks/bootstrap-centos.yml
+
10
-
9
View file @
bcf69591
...
...
@@ -41,6 +41,15 @@
-
'
'
'
ID="ol"'
'
in
os_release.stdout_lines'
-
(ansible_distribution_version | float) <
7.6
-
name
:
Install EPEL for Oracle Linux repo package
package
:
name
:
"
oracle-epel-release-el{{
ansible_distribution_major_version
}}"
state
:
present
when
:
-
use_oracle_public_repo|default(true)
-
'
'
'
ID="ol"'
'
in
os_release.stdout_lines'
-
(ansible_distribution_version | float) >=
7.6
-
name
:
Enable Oracle Linux repo
ini_file
:
dest
:
"
/etc/yum.repos.d/oracle-linux-ol{{
ansible_distribution_major_version
}}.repo"
...
...
@@ -48,6 +57,7 @@
option
:
"
{{
item.option
}}"
value
:
"
{{
item.value
}}"
with_items
:
-
{
option
:
"
name"
,
value
:
"
ol{{
ansible_distribution_major_version
}}_addons"
}
-
{
option
:
"
enabled"
,
value
:
"
1"
}
-
{
option
:
"
baseurl"
,
value
:
"
http://yum.oracle.com/repo/OracleLinux/OL{{
ansible_distribution_major_version
}}/addons/x86_64/"
}
when
:
...
...
@@ -55,15 +65,6 @@
-
'
'
'
ID="ol"'
'
in
os_release.stdout_lines'
-
(ansible_distribution_version | float) >=
7.6
-
name
:
Install EPEL for Oracle Linux repo package
package
:
name
:
"
oracle-epel-release-el{{
ansible_distribution_major_version
}}"
state
:
present
when
:
-
use_oracle_public_repo|default(true)
-
'
'
'
ID="ol"'
'
in
os_release.stdout_lines'
-
(ansible_distribution_version | float) >=
7.6
# CentOS ships with python installed
-
name
:
Check presence of fastestmirror.conf
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help