Merge branch 'docker_setup'

2020-12-12 14:11:48 +01:00 · 2020-12-12 14:11:48 +01:00 · be5aaadbdc
commit be5aaadbdc
parent b354887dba a7ca153cf6
6 changed files with 2 additions and 2 deletions
--- a/pottwal.yml
+++ b/pottwal.yml
@ -5,7 +5,7 @@
    ansible_python_interpreter: /usr/bin/python3
  roles:
-  - role: docker
+  - role: docker_setup
    vars:
      docker_data_root: "/srv/docker"
  - role: apache
--- a/roles/docker_setup/defaults/main.yml
+++ b/roles/docker_setup/defaults/main.yml
--- a/roles/docker_setup/handlers/main.yml
+++ b/roles/docker_setup/handlers/main.yml
--- a/roles/docker_setup/tasks/main.yml
+++ b/roles/docker_setup/tasks/main.yml
--- a/roles/docker_setup/templates/daemon.json.j2
+++ b/roles/docker_setup/templates/daemon.json.j2
--- a/tau.yml
+++ b/tau.yml
@ -5,7 +5,7 @@
    ansible_python_interpreter: /usr/bin/python3
  roles:
-  - role: docker
+  - role: docker_setup
  - role: apache
  tasks: