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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
7ad55231
Commit
7ad55231
authored
7 years ago
by
Vijay Katam
Browse files
Options
Downloads
Patches
Plain Diff
restrict rpm query to redhat
parent
5efda3ed
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/docker/tasks/systemd.yml
+1
-1
1 addition, 1 deletion
roles/docker/tasks/systemd.yml
roles/docker/templates/docker.service.j2
+1
-1
1 addition, 1 deletion
roles/docker/templates/docker.service.j2
with
2 additions
and
2 deletions
roles/docker/tasks/systemd.yml
+
1
−
1
View file @
7ad55231
...
...
@@ -13,7 +13,7 @@
-
name
:
get systemd version
command
:
rpm -q --qf '%{V}\n' systemd
register
:
systemd_version
when
:
not (
ansible_os_family
in ["CoreOS", "Container Linux by CoreOS"] or
is_atomic
)
when
:
ansible_os_family
== "RedHat" and not
is_atomic
-
name
:
Write docker.service systemd file
template
:
...
...
This diff is collapsed.
Click to expand it.
roles/docker/templates/docker.service.j2
+
1
−
1
View file @
7ad55231
...
...
@@ -24,7 +24,7 @@ ExecStart={{ docker_bin_dir }}/docker daemon \
$DOCKER_NETWORK_OPTIONS \
$DOCKER_DNS_OPTIONS \
$INSECURE_REGISTRY
{% if systemd_version.stdout|int >= 226 %}
{% if
ansible_os_family == "RedHat" and
systemd_version.stdout|int >= 226 %}
TasksMax=infinity
{% endif %}
LimitNOFILE=1048576
...
...
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