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
b74c2f89
Commit
b74c2f89
authored
8 years ago
by
Spencer Smith
Browse files
Options
Downloads
Patches
Plain Diff
lay down a systemd dropin instead of the /run/flannel_docker_opts.env symlink
parent
7ac7fc33
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/network_plugin/flannel/tasks/main.yml
+7
-5
7 additions, 5 deletions
roles/network_plugin/flannel/tasks/main.yml
roles/network_plugin/flannel/templates/docker-systemd
+2
-0
2 additions, 0 deletions
roles/network_plugin/flannel/templates/docker-systemd
with
9 additions
and
5 deletions
roles/network_plugin/flannel/tasks/main.yml
+
7
−
5
View file @
b74c2f89
...
...
@@ -42,12 +42,14 @@
mode
:
0644
notify
:
-
restart docker
when
:
ansible_os_family != "CoreOS"
-
name
:
Flannel | Create docker config symlink for CoreOS
file
:
src
:
"
/etc/default/docker"
dest
:
"
/run/flannel_docker_opts.env"
state
:
link
-
name
:
Flannel | Create docker dropin for CoreOS
template
:
src
:
docker-dropin
dest
:
"
/etc/systemd/system/docker.service.d/flannel-options.conf"
notify
:
-
restart docker
when
:
ansible_os_family == "CoreOS"
-
meta
:
flush_handlers
This diff is collapsed.
Click to expand it.
roles/network_plugin/flannel/templates/docker-systemd
0 → 100644
+
2
−
0
View file @
b74c2f89
[Service]
Environment="DOCKER_OPTS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"
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