ansible/xoxys.docker_engine
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix ansible_managed handling
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2019-08-27 22:02:41 +02:00
parent 10d7b8ead6
commit 08431fb49e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/etc/containers/registries.conf.j2
View File

@ -1,4 +1,4 @@
# {{ ansible_managed }} {{ ansible_managed | comment }}
# This is a system-wide configuration file used to # This is a system-wide configuration file used to
# keep track of registries for various container backends. # keep track of registries for various container backends.
# It adheres to TOML format and does not support recursive # It adheres to TOML format and does not support recursive

2
templates/etc/sysconfig/docker-storage-setup.j2
View File

@ -1,5 +1,5 @@
#jinja2: lstrip_blocks: True #jinja2: lstrip_blocks: True
# {{ ansible_managed }} {{ ansible_managed | comment }}
STORAGE_DRIVER=overlay2 STORAGE_DRIVER=overlay2
{% if dockerengine_storage_pvs is defined %} {% if dockerengine_storage_pvs is defined %}
DEVS={{ dockerengine_storage_pvs }} DEVS={{ dockerengine_storage_pvs }}

4
templates/etc/sysconfig/docker.j2
View File

@ -1,6 +1,4 @@
## {{ ansible_managed }} {{ ansible_managed | comment }}
# /etc/sysconfig/docker
# Modify these options if you want to change the way the docker daemon runs # Modify these options if you want to change the way the docker daemon runs
OPTIONS='{{ dockerengine_cli_options | prefix | join(' ') }}{{ ' --userns-remap='+dockerengine_nsremap_user+':'+dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}' OPTIONS='{{ dockerengine_cli_options | prefix | join(' ') }}{{ ' --userns-remap='+dockerengine_nsremap_user+':'+dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
if [ -z "${DOCKER_CERT_PATH}" ]; then if [ -z "${DOCKER_CERT_PATH}" ]; then