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
d94253ff
Commit
d94253ff
authored
Jun 22, 2016
by
Chris Bell
Committed by
GitHub
Jun 22, 2016
Browse files
Options
Downloads
Patches
Plain Diff
Modify calico docker.service
parent
dc90c594
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/network_plugin/calico/templates/systemd-docker.service
+5
-4
5 additions, 4 deletions
roles/network_plugin/calico/templates/systemd-docker.service
with
5 additions
and
4 deletions
roles/network_plugin/calico/templates/systemd-docker.service
+
5
−
4
View file @
d94253ff
...
@@ -12,9 +12,9 @@ Requires=docker.socket
...
@@ -12,9 +12,9 @@ Requires=docker.socket
[Service]
[Service]
Type
=
notify
Type
=
notify
{% if ansible_os_family
=
= "RedHat" %}
{% if ansible_os_family
=
= "RedHat" %}
EnvironmentFile
=
-/etc/
sysconfig
/docker
EnvironmentFile
=
-/etc/
default
/docker
EnvironmentFile
=
-/etc/
sysconfig
/docker-network
EnvironmentFile
=
-/etc/
default
/docker-network
EnvironmentFile
=
-/etc/
sysconfig
/docker-storage
EnvironmentFile
=
-/etc/
docker
/docker-storage
{% elif ansible_os_family
=
= "Debian" %}
{% elif ansible_os_family
=
= "Debian" %}
EnvironmentFile
=
-/etc/default/docker
EnvironmentFile
=
-/etc/default/docker
{%
endif
%}
{%
endif
%}
...
@@ -23,7 +23,8 @@ ExecStart=/usr/bin/docker daemon \
...
@@ -23,7 +23,8 @@ ExecStart=/usr/bin/docker daemon \
$OPTIONS
\
$OPTIONS
\
$DOCKER_STORAGE_OPTIONS
\
$DOCKER_STORAGE_OPTIONS
\
$DOCKER_NETWORK_OPTIONS
\
$DOCKER_NETWORK_OPTIONS
\
$INSECURE_REGISTRY
$INSECURE_REGISTRY
\
$DOCKER_OPTS
LimitNOFILE
=
1048576
LimitNOFILE
=
1048576
LimitNPROC
=
1048576
LimitNPROC
=
1048576
LimitCORE
=
infinity
LimitCORE
=
infinity
...
...
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