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
d316b02d
Unverified
Commit
d316b02d
authored
4 years ago
by
Christopher Randles
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
else condition required otherwise AnsibleUndefinedVariable is triggered (#5722)
parent
7910198b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/container-engine/docker/templates/docker.service.j2
+3
-3
3 additions, 3 deletions
roles/container-engine/docker/templates/docker.service.j2
with
3 additions
and
3 deletions
roles/container-engine/docker/templates/docker.service.j2
+
3
−
3
View file @
d316b02d
...
...
@@ -3,16 +3,16 @@ Description=Docker Application Container Engine
Documentation=http://docs.docker.com
{% if ansible_os_family == "RedHat" %}
After=network.target {{ ' docker-storage-setup.service' if docker_container_storage_setup else '' }}{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=')
else ''
}}
{{ 'Wants=docker-storage-setup.service' if docker_container_storage_setup else '' }}
{% elif ansible_os_family == "Debian" %}
After=network.target docker.socket{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=')
else ''
}}
Wants=docker.socket
{% elif ansible_os_family == "Suse" %}
After=network.target lvm2-monitor.service SuSEfirewall2.service
# After=network.target{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
# {{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
# {{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=')
else ''
}}
{% endif %}
[Service]
...
...
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