From 6df86eb802caf469e6a490253ad1bca2144d0524 Mon Sep 17 00:00:00 2001 From: Andrea Tosatto Date: Fri, 11 Oct 2019 09:15:06 +0200 Subject: [PATCH] Rename the tasks files --- tasks/main.yml | 12 ++++++------ tasks/{repo_Debian.yml => repo-Debian.yml} | 0 tasks/{repo_RedHat.yml => repo-RedHat.yml} | 0 tasks/{reset_connection.yml => reset-connection.yml} | 0 tasks/{docker_engine.yml => setup-docker-engine.yml} | 0 tasks/{docker_group.yml => setup-docker-group.yml} | 2 +- tasks/{docker_py.yml => setup-docker-py.yml} | 0 tasks/{swarm_cluster.yml => setup-swarm-cluster.yml} | 0 tasks/{swarm_labels.yml => setup-swarm-labels.yml} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename tasks/{repo_Debian.yml => repo-Debian.yml} (100%) rename tasks/{repo_RedHat.yml => repo-RedHat.yml} (100%) rename tasks/{reset_connection.yml => reset-connection.yml} (100%) rename tasks/{docker_engine.yml => setup-docker-engine.yml} (100%) rename tasks/{docker_group.yml => setup-docker-group.yml} (97%) rename tasks/{docker_py.yml => setup-docker-py.yml} (100%) rename tasks/{swarm_cluster.yml => setup-swarm-cluster.yml} (100%) rename tasks/{swarm_labels.yml => setup-swarm-labels.yml} (100%) diff --git a/tasks/main.yml b/tasks/main.yml index 91447ed..536288b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,23 +43,23 @@ and ansible_python_version is version_compare('2.7.9', '<') # Install the Docker repository -- include: "repo_{{ ansible_os_family }}.yml" +- include: "repo-{{ ansible_os_family }}.yml" when: not skip_repo # Install the Docker Engine -- include: docker_engine.yml +- include: setup-docker-engine.yml when: not skip_engine # Install docker-py -- include: docker_py.yml +- include: setup-docker-py.yml when: not skip_docker_py # Adds the Docker admin users to the Docker group -- include: docker_group.yml +- include: setup-docker-group.yml when: not skip_group # Setup the Docker Swarm Cluster - block: - - include: swarm_cluster.yml - - include: swarm_labels.yml + - include: setup-swarm-cluster.yml + - include: setup-swarm-labels.yml when: not skip_swarm diff --git a/tasks/repo_Debian.yml b/tasks/repo-Debian.yml similarity index 100% rename from tasks/repo_Debian.yml rename to tasks/repo-Debian.yml diff --git a/tasks/repo_RedHat.yml b/tasks/repo-RedHat.yml similarity index 100% rename from tasks/repo_RedHat.yml rename to tasks/repo-RedHat.yml diff --git a/tasks/reset_connection.yml b/tasks/reset-connection.yml similarity index 100% rename from tasks/reset_connection.yml rename to tasks/reset-connection.yml diff --git a/tasks/docker_engine.yml b/tasks/setup-docker-engine.yml similarity index 100% rename from tasks/docker_engine.yml rename to tasks/setup-docker-engine.yml diff --git a/tasks/docker_group.yml b/tasks/setup-docker-group.yml similarity index 97% rename from tasks/docker_group.yml rename to tasks/setup-docker-group.yml index b0c538c..75e1ff5 100644 --- a/tasks/docker_group.yml +++ b/tasks/setup-docker-group.yml @@ -22,7 +22,7 @@ # See https://stackoverflow.com/a/44753457 - name: Reset ansible connection after group changes (Ansible >= 2.3.0). - include: reset_connection.yml + include: reset-connection.yml static: false # we need to force dynamic inclusion here to avoid 'reset_connection' to be # always executed even if the when condition evaluates to false on Ansible 2.4.x # or to generate syntax errors on Ansible < 2.3 diff --git a/tasks/docker_py.yml b/tasks/setup-docker-py.yml similarity index 100% rename from tasks/docker_py.yml rename to tasks/setup-docker-py.yml diff --git a/tasks/swarm_cluster.yml b/tasks/setup-swarm-cluster.yml similarity index 100% rename from tasks/swarm_cluster.yml rename to tasks/setup-swarm-cluster.yml diff --git a/tasks/swarm_labels.yml b/tasks/setup-swarm-labels.yml similarity index 100% rename from tasks/swarm_labels.yml rename to tasks/setup-swarm-labels.yml