Merge pull request #9 from m4rcu5nl/develop

Bug fixes
Merge pull request #8 from m4rcu5nl/feature/skip_tasks_in_check_mode
2017-12-17 05:59:41 +01:00 · 2017-12-17 05:52:44 +01:00 · 2017-12-17 05:49:36 +01:00 · 2017-12-17 05:40:03 +01:00 · 2017-12-17 05:32:14 +01:00 · 2017-09-11 16:51:46 +02:00
4 changed files with 10 additions and 7 deletions
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ The 16 character network ID of the network the new members should join.
 Example Playbook
 ----------------
-
+```yaml
    - hosts: servers
      vars:
         zerotier_network_id: 1234567890qwerty
         zerotier_accesstoken: "{{ vault_zerotier_accesstoken }}"
      roles:
         - { role: m4rcu5nl.zerotier }
-
+```
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -36,6 +36,7 @@
  when:
  - zerotier_repo|succeeded
  - not ansible_check_mode
  tags:
  - installation
  - packages
--- 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
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,13 @@
 ---
 # 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
  check_mode: yes
- include: join_network.yml
+- include_tasks: join_network.yml
  when:
  - 'zerotier_network_id not in joinednetworks.stdout'
  - zerotier_accesstoken is defined
Author	SHA1	Message	Date
Marcus	097a4f055b	Merge pull request #9 from m4rcu5nl/develop Bug fixes	2017-12-17 05:59:41 +01:00
Marcus	62682def92	Merge pull request #8 from m4rcu5nl/feature/skip_tasks_in_check_mode Resolved errors in check-mode	2017-12-17 05:52:44 +01:00
Marcus Meurs	c90f7556c2	Resolved errors in check-mode Fixes #3	2017-12-17 05:49:36 +01:00
Marcus	9b6296e678	Merge pull request #7 from m4rcu5nl/feature/import_tasks_propperly Move away from deprecated way to include tasks	2017-12-17 05:40:03 +01:00
Marcus Meurs	51d2085c02	Move away from deprecated way to include tasks Fixes #6	2017-12-17 05:32:14 +01:00
Marcus	e70be64ef7	Merge pull request #5 from gbraad/patch-1 Change headers for rendering	2017-09-11 16:51:46 +02:00
Gerard Braad	769e901ca1	Change headers for rendering ... and make example into code-block with syntax definition	2017-09-11 11:33:20 +08:00