From 51d2085c0252771a66eb4fcc43a5f5de1920c1a6 Mon Sep 17 00:00:00 2001 From: Marcus Meurs Date: Sun, 17 Dec 2017 05:32:14 +0100 Subject: [PATCH 1/2] Move away from deprecated way to include tasks Fixes #6 --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 2f2f8e8..8d19b7d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,12 @@ --- # tasks file for ansible-role-zerotier -- include: install.yml +- import_tasks: install.yml - name: Check for successfully joined networks shell: zerotier-cli listnetworks | grep 'OK'| awk '{print $3}' register: joinednetworks -- include: join_network.yml +- include_tasks: join_network.yml when: - 'zerotier_network_id not in joinednetworks.stdout' - zerotier_accesstoken is defined From c90f7556c2d394de74a744df7eea1c19fa69a8f0 Mon Sep 17 00:00:00 2001 From: Marcus Meurs Date: Sun, 17 Dec 2017 05:49:36 +0100 Subject: [PATCH 2/2] Resolved errors in check-mode Fixes #3 --- tasks/install.yml | 1 + tasks/join_network.yml | 1 + tasks/main.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/tasks/install.yml b/tasks/install.yml index 34e95fc..3249a31 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -36,6 +36,7 @@ when: - zerotier_repo|succeeded + - not ansible_check_mode tags: - installation - packages diff --git a/tasks/join_network.yml b/tasks/join_network.yml index 4dba8b1..26e0213 100644 --- a/tasks/join_network.yml +++ b/tasks/join_network.yml @@ -29,5 +29,6 @@ when: - zerotier_accesstoken is defined + - not ansible_check_mode tags: - configuration diff --git a/tasks/main.yml b/tasks/main.yml index 8d19b7d..fc3a08f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,6 +5,7 @@ - name: Check for successfully joined networks shell: zerotier-cli listnetworks | grep 'OK'| awk '{print $3}' register: joinednetworks + check_mode: yes - include_tasks: join_network.yml when: