From e1115c9cbd8397d0291086a4696e6306498afbc4 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 14:08:06 +0100 Subject: [PATCH 1/2] Rename docker to docker_setup * More in line of what the role does * Consistent with Ansible's docker role naming scheme --- roles/{docker => docker_setup}/defaults/main.yml | 0 roles/{docker => docker_setup}/handlers/main.yml | 0 roles/{docker => docker_setup}/tasks/main.yml | 0 roles/{docker => docker_setup}/templates/daemon.json.j2 | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename roles/{docker => docker_setup}/defaults/main.yml (100%) rename roles/{docker => docker_setup}/handlers/main.yml (100%) rename roles/{docker => docker_setup}/tasks/main.yml (100%) rename roles/{docker => docker_setup}/templates/daemon.json.j2 (100%) diff --git a/roles/docker/defaults/main.yml b/roles/docker_setup/defaults/main.yml similarity index 100% rename from roles/docker/defaults/main.yml rename to roles/docker_setup/defaults/main.yml diff --git a/roles/docker/handlers/main.yml b/roles/docker_setup/handlers/main.yml similarity index 100% rename from roles/docker/handlers/main.yml rename to roles/docker_setup/handlers/main.yml diff --git a/roles/docker/tasks/main.yml b/roles/docker_setup/tasks/main.yml similarity index 100% rename from roles/docker/tasks/main.yml rename to roles/docker_setup/tasks/main.yml diff --git a/roles/docker/templates/daemon.json.j2 b/roles/docker_setup/templates/daemon.json.j2 similarity index 100% rename from roles/docker/templates/daemon.json.j2 rename to roles/docker_setup/templates/daemon.json.j2 From a7ca153cf61b68f01d80546fa91eefa42fa0770d Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 14:09:05 +0100 Subject: [PATCH 2/2] Adapt role name in host playbooks --- pottwal.yml | 2 +- tau.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index 14bbcea..77f8066 100644 --- 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 diff --git a/tau.yml b/tau.yml index 629b94d..a461316 100644 --- 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: