Merge branch 'feature/improve_performance' into develop

pull/20/head
Marcus Meurs 2018-04-09 05:36:28 +02:00
commit 54f3f0bcc0
2 changed files with 5 additions and 1 deletions

View File

@ -10,7 +10,8 @@
zerotier_node_id: "{{ nodeid.stdout }}"
- name: Add and authorize members to network
uri:
local_action:
module: uri
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ zerotier_node_id }}"
method: POST
headers:
@ -24,6 +25,7 @@
ipAssignments: "{{ zerotier_member_ip_assignments | default([]) | list }}"
body_format: json
register: apiresult
become: false
when:
- zerotier_accesstoken is defined

View File

@ -1,6 +1,8 @@
---
# tasks file for ansible-role-zerotier
- import_tasks: install.yml
when:
- not skip_install|default(false)|bool
- import_tasks: authorize_node.yml
when: