Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
fc8551bc
Unverified
Commit
fc8551bc
authored
4 years ago
by
petruha
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Run containerd related tasks on OracleLinux. (#7250)
parent
c2c97c36
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/container-engine/containerd/tasks/containerd_repo.yml
+2
-2
2 additions, 2 deletions
roles/container-engine/containerd/tasks/containerd_repo.yml
roles/container-engine/containerd/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/container-engine/containerd/tasks/main.yml
with
3 additions
and
3 deletions
roles/container-engine/containerd/tasks/containerd_repo.yml
+
2
−
2
View file @
fc8551bc
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
dest
:
"
{{
yum_repo_dir
}}/containerd.repo"
dest
:
"
{{
yum_repo_dir
}}/containerd.repo"
when
:
ansible_distribution == "Fedora"
when
:
ansible_distribution == "Fedora"
-
name
:
Configure containerd repository on RedHat/CentOS
-
name
:
Configure containerd repository on RedHat/
OracleLinux/
CentOS
template
:
template
:
src
:
"
rh_containerd.repo.j2"
src
:
"
rh_containerd.repo.j2"
dest
:
"
{{
yum_repo_dir
}}/containerd.repo"
dest
:
"
{{
yum_repo_dir
}}/containerd.repo"
when
:
ansible_distribution in ["CentOS","RedHat"]
when
:
ansible_distribution in ["CentOS",
"OracleLinux",
"RedHat"]
This diff is collapsed.
Click to expand it.
roles/container-engine/containerd/tasks/main.yml
+
1
−
1
View file @
fc8551bc
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
fail
:
fail
:
msg
:
"
{{
ansible_distribution
}}
is
not
supported
by
containerd."
msg
:
"
{{
ansible_distribution
}}
is
not
supported
by
containerd."
when
:
when
:
-
not ansible_distribution in ["CentOS","RedHat", "Ubuntu", "Debian", "Fedora"]
-
not ansible_distribution in ["CentOS",
"OracleLinux",
"RedHat", "Ubuntu", "Debian", "Fedora"]
-
name
:
gather os specific variables
-
name
:
gather os specific variables
include_vars
:
"
{{
item
}}"
include_vars
:
"
{{
item
}}"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment