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
4b5f780f
Unverified
Commit
4b5f780f
authored
7 years ago
by
Brad Beam
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2357 from octarinesec/eyeofthefrog/set_TasksMax_infinity_for_ubuntu
Set TasksMax to infinity on any OS with systemd
parents
31659efe
85c69c2a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/docker/tasks/systemd.yml
+2
-2
2 additions, 2 deletions
roles/docker/tasks/systemd.yml
roles/docker/templates/docker.service.j2
+1
-1
1 addition, 1 deletion
roles/docker/templates/docker.service.j2
with
3 additions
and
3 deletions
roles/docker/tasks/systemd.yml
+
2
−
2
View file @
4b5f780f
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
when
:
http_proxy is defined or https_proxy is defined
when
:
http_proxy is defined or https_proxy is defined
-
name
:
get systemd version
-
name
:
get systemd version
command
:
rpm -q --qf '%{V}\n' systemd
command
:
systemctl --version | head -n 1 | cut -d " " -f
2
register
:
systemd_version
register
:
systemd_version
when
:
ansible_os_family == "RedHat" and
not is_atomic
when
:
not is_atomic
changed_when
:
false
changed_when
:
false
-
name
:
Write docker.service systemd file
-
name
:
Write docker.service systemd file
...
...
This diff is collapsed.
Click to expand it.
roles/docker/templates/docker.service.j2
+
1
−
1
View file @
4b5f780f
...
@@ -24,7 +24,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout|versi
...
@@ -24,7 +24,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout|versi
$DOCKER_NETWORK_OPTIONS \
$DOCKER_NETWORK_OPTIONS \
$DOCKER_DNS_OPTIONS \
$DOCKER_DNS_OPTIONS \
$INSECURE_REGISTRY
$INSECURE_REGISTRY
{% if
ansible_os_family == "RedHat"
and systemd_version.stdout|int >= 226 %}
{% if
not is_atomic
and systemd_version.stdout|int >= 226 %}
TasksMax=infinity
TasksMax=infinity
{% endif %}
{% endif %}
LimitNOFILE=1048576
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