Merge branch 'feature/optional_member_description' into develop

pull/16/head
Marcus Meurs 2018-04-05 01:32:27 +02:00
commit 8564a01220
2 changed files with 23 additions and 1 deletions

View File

@ -30,6 +30,9 @@ Default: `false`
### zerotier_member_ip_assignments ### zerotier_member_ip_assignments
A list of IP addresses to assign this member. The member will be automatically assigned an address on the network if left out. A list of IP addresses to assign this member. The member will be automatically assigned an address on the network if left out.
### zerotier_member_description
Optional desription for a member.
Example Playbook Example Playbook
---------------- ----------------
@ -49,6 +52,24 @@ Example Inventory
```INI ```INI
[servers] [servers]
web1.example.com zerotier_member_ip_assignments='["192.168.195.1", "192.168.195.2", "192.168.195.3"]' web1.example.com zerotier_member_ip_assignments='["192.168.195.1", "192.168.195.2"]'
web2.example.com zerotier_member_ip_assignments='["192.168.195.3", "192.168.195.4"'
db1.example.com zerotier_member_ip_assignments='["192.168.195.10"]' db1.example.com zerotier_member_ip_assignments='["192.168.195.10"]'
db2.example.com zerotier_member_ip_assignments='["192.168.195.11"]'
db3.example.com zerotier_member_ip_assignments='["192.168.195.12"]'
[webservers]
web1.example.com
web2.example.com
[dbservers]
db1.example.com
db2.example.com
db3.example.com
[webservers:vars]
zerotier_member_description='<AppName> webserver'
[dbservers:vars]
zerotier_member_description='<AppName> db cluster node'
``` ```

View File

@ -17,6 +17,7 @@
Authorization: bearer {{ zerotier_accesstoken }} Authorization: bearer {{ zerotier_accesstoken }}
body: body:
name: "{{ zerotier_register_short_hostname | ternary(inventory_hostname_short, inventory_hostname) }}" name: "{{ zerotier_register_short_hostname | ternary(inventory_hostname_short, inventory_hostname) }}"
description: "{{ zerotier_member_description | default() }}"
hidden: false hidden: false
config: config:
authorized: "{{ zerotier_authorize_member }}" authorized: "{{ zerotier_authorize_member }}"