From 66ac6e704a3c87350305a92806fd3e1f8aec2249 Mon Sep 17 00:00:00 2001
From: Adrien Waksberg <git@waks.be>
Date: Mon, 22 Nov 2021 11:43:06 +0100
Subject: [PATCH] feat: replace docker variable to swarm

---
 defaults/main.yml             |  7 ++++---
 molecule/default/converge.yml |  7 +++----
 tasks/cluster.yml             | 16 ++++++++--------
 tasks/config.yml              | 12 ++++++------
 tasks/install.yml             |  4 ++--
 tasks/main.yml                |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index a69eca4..8239107 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
-docker_swarm_manager: false
-docker_repo_distribution: '{{ ansible_distribution_release }}'
-docker_services: []
+swarm_manager: false
+swarm_advertise_addr: 127.0.0.1
+swarm_services: []
+swarm_networks: []
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index e5ebd95..ec147a0 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -4,11 +4,10 @@
   roles:
     - swarm
   vars:
-    docker_swarm_manager: true
-    docker_advertise_addr: 127.0.0.1
-    docker_networks:
+    swarm_manager: true
+    swarm_networks:
       - name: proxy
-    docker_services:
+    swarm_services:
       - name: traefik
         image: traefik:1.7
         networks:
diff --git a/tasks/cluster.yml b/tasks/cluster.yml
index 0274451..da79b0b 100644
--- a/tasks/cluster.yml
+++ b/tasks/cluster.yml
@@ -1,16 +1,16 @@
 ---
 - name: init swarm cluster
   community.docker.docker_swarm:
-    advertise_addr: '{{ docker_advertise_addr }}'
+    advertise_addr: '{{ swarm_advertise_addr }}'
     state: present
-  when: docker_swarm_manager
-  tags: docker
+  when: swarm_manager
+  tags: swarm
 
 - name: join swarm cluster
   community.docker.docker_swarm:
-    advertise_addr: '{{ docker_advertise_addr }}'
-    join_token: '{{ docker_join_token }}'
-    remote_addrs: '{{ docker_remote_addrs }}'
+    advertise_addr: '{{ swarm_advertise_addr }}'
+    join_token: '{{ swarm_join_token }}'
+    remote_addrs: '{{ swarm_remote_addrs }}'
     state: join
-  when: not docker_swarm_manager
-  tags: docker
+  when: not swarm_manager
+  tags: swarm
diff --git a/tasks/config.yml b/tasks/config.yml
index 1ba5a5d..fdb1cfd 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -5,8 +5,8 @@
     driver: '{{ item.driver|default("bridge") }}'
     scope: swarm
     state: '{{ item.state|default("present") }}'
-  loop: '{{ docker_networks }}'
-  tags: docker
+  loop: '{{ swarm_networks }}'
+  tags: swarm
 
 - name: manage services
   community.docker.docker_swarm_service:
@@ -22,16 +22,16 @@
     env: '{{ item.env|default({}) }}'
     container_labels: '{{ item.labels|default({}) }}'
     state: present
-  loop: '{{ docker_services }}'
+  loop: '{{ swarm_services }}'
   when: '"state" not in item or item.state != "absent"'
   no_log: false
-  tags: docker
+  tags: swarm
 
 - name: remove services
   community.docker.docker_swarm_service:
     name: '{{ item.name }}'
     state: absent
-  loop: '{{ docker_services }}'
+  loop: '{{ swarm_services }}'
   when: '"state" in item and item.state == "absent"'
   no_log: true
-  tags: docker
+  tags: swarm
diff --git a/tasks/install.yml b/tasks/install.yml
index c2b1487..003161a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -4,10 +4,10 @@
     name:
       - docker.io
       - python3-docker
-  tags: docker
+  tags: swarm
 
 - name: enable and start service
   ansible.builtin.service:
     name: docker
     state: started
-  tags: docker
+  tags: swarm
diff --git a/tasks/main.yml b/tasks/main.yml
index ea7dadc..1abddab 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,4 +2,4 @@
 - import_tasks: install.yml
 - import_tasks: cluster.yml
 - import_tasks: config.yml
-  when: docker_swarm_manager
+  when: swarm_manager