fix ssh connection reset (see #39)

molecule/common/create.yml

@@ -17,7 +17,7 @@
 
         - name: Create molecule Docker instance(s)
           docker_container:
-            name: "{{ item.name }}-{{ molecule_yml.scenario.name }}"
+            name: "{{ item.name }}"
             hostname: "{{ item.name }}"
             image: "{{ docker_image_name }}"
             privileged: yes

molecule/common/destroy.yml

@@ -11,7 +11,7 @@
     - block:
         - name: Destroy molecule Docker instance(s)
           docker_container:
-            name: "{{ item.name }}-{{ molecule_yml.scenario.name }}"
+            name: "{{ item.name }}"
             state: absent
           with_items: "{{ molecule_yml.platforms }}"
       when: molecule_driver_name == 'docker'

molecule/swarm-cluster/molecule.yml

@@ -5,7 +5,7 @@ scenario:
 
 driver:
   name: "${MOLECULE_DRIVER_NAME:-docker}"   # The Molecule Driver can be overriden using
-                                            # the MOLECULE_DRIVER_NAME environment variables.
+                                            # the MOLECULE_DRIVER_NAME environment variable.
 dependency:
   name: galaxy
 
@@ -42,5 +42,7 @@ lint:
 
 verifier:
   name: testinfra
+  additional_files_or_dirs:
+    - ../common/tests/
   lint:
-    name: flake8
+    name: flake8   # Will use the rules defined in .flake8

tasks/docker_group.yml

@@ -9,20 +9,23 @@
   become: true
   with_items: "{{ docker_admin_users }}"
 
-# Little hack to make docker group visible.
-# See http://stackoverflow.com/a/37337848/1370301
-- name: Kill the ansible_user active SSH connections
-  shell: "sleep 1; pkill -u {{ ansible_user }} {{ ssh_daemon }}"
-  async: 3  # fail after 3 seconds of waiting
-  poll: 2   # wait 2 seconds befor polling the task status
-  failed_when: False  # suceed even if the command fails
+- block:
+
+    # See http://stackoverflow.com/a/37337848/1370301
+    - name: Kill the ansible_user active SSH connections
+      shell: "sleep 1; pkill -u {{ ansible_user }} {{ ssh_daemon }}"
+      async: 3  # fail after 3 seconds of waiting
+      poll: 2   # wait 2 seconds befor polling the task status
+      failed_when: False  # suceed even if the command fails
+      when: ansible_version is defined
+        and (ansible_version.full | version_compare('2.3.0.0', '<'))
+
+    # See https://stackoverflow.com/a/44753457
+    - name: Reset ansible connection after group changes
+      meta: reset_connection
+      when: ansible_version is defined
+        and (ansible_version.full | version_compare('2.3.0.0', '>='))
+
   when: ansible_user is defined
     and ansible_user in docker_admin_users
-    and ansible_user in "{{ addtogroup.results | selectattr('changed') | map(attribute='item') | list }}"
-    and ansible_version.major <= 2 and ansible_version.minor <3
-
-# See https://stackoverflow.com/a/44753457
-- name: Reset ansible connection after group changes
-  meta: reset_connection
-  when: ansible_version.major = 2
-    and ansible_version.minor >= 3
+    and ansible_user in (addtogroup.results | selectattr('changed') | map(attribute='item') | list)

tasks/docker_py.yml

@@ -1,7 +1,7 @@
 ---
 
 # Specified version because of https://github.com/ansible/ansible/issues/17495
-- name: Install docker-py 1.9.0 to fix Ansible issue 17495
+- name: Install docker-py 1.9.0
   pip:
     name: docker-py
     version: 1.9.0

tasks/main.yml

@@ -55,5 +55,7 @@
   when: not skip_group
 
 # Setup the Docker Swarm Cluster
-- include: swarm_cluster.yml
+- block:
+  - include: swarm_cluster.yml
+  - include: swarm_labels.yml
   when: not skip_swarm

tasks/swarm_labels.yml

@@ -0,0 +1,35 @@
+---
+
+- name: Get list of labels
+  command: >-
+         docker inspect
+         --format {% raw %}'{{range $key, $value := .Spec.Labels}}{{printf "%s\n" $key}}{{end}}'{% endraw %}
+         {{ ansible_hostname }}
+  register: docker_swarm_labels
+  changed_when: False
+  delegate_to: "{{ groups['docker_swarm_manager'][0] }}"
+  delegate_facts: True
+  tags:
+    - skip_ansible_lint
+    - swarm_labels
+
+- name: Remove labels from swarm node
+  command: docker node update --label-rm {{ item }} {{ ansible_hostname }}
+  with_items: "{{ docker_swarm_labels.stdout_lines }}"
+  when: item not in swarm_labels
+  delegate_to: "{{ groups['docker_swarm_manager'][0] }}"
+  delegate_facts: True
+  tags:
+    - skip_ansible_lint
+    - swarm_labels
+
+- name: Assign labels to swarm nodes | if any
+  command: docker node update --label-add {{ item }}=true {{ ansible_hostname }}
+  when: item not in docker_swarm_labels.stdout_lines
+  with_items:
+    - "{{ swarm_labels  | default([]) }}"
+  delegate_to: "{{ groups['docker_swarm_manager'][0] }}"
+  delegate_facts: True
+  tags:
+    - skip_ansible_lint
+    - swarm_labels