From f618c42d15f4ec3e5cba0b88738d5ebe9d5f65be Mon Sep 17 00:00:00 2001 From: thiuda Date: Thu, 3 Jun 2021 20:41:12 +0200 Subject: [PATCH] Changed default value to jinja2 default vars --- defaults/main.yml | 2 -- tasks/main.yml | 1 - templates/daemon.json.j2 | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 defaults/main.yml diff --git a/defaults/main.yml b/defaults/main.yml deleted file mode 100644 index 3ec140c..0000000 --- a/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -change_docker_root: false -docker_root: /home/docker diff --git a/tasks/main.yml b/tasks/main.yml index cb126cb..5cbd3bc 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,4 +50,3 @@ src: templates/daemon.json.j2 dest: /etc/docker/daemon.json mode: 0644 - when: change_docker_root diff --git a/templates/daemon.json.j2 b/templates/daemon.json.j2 index d0eabb8..9d37e03 100644 --- a/templates/daemon.json.j2 +++ b/templates/daemon.json.j2 @@ -1,3 +1,3 @@ { - "data-root": "{{ docker_root }}" + "data-root": "{{ docker_root | default(/var/lib/docker) }}" } \ No newline at end of file