infra
/
ansible-role-zerotier
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use the same fact syntax throughout the role 

Create consistency by using the ansible_facts['somefact'] syntax everywhere.
develop
Marcus Meurs 2018-12-10 23:47:16 +01:00
parent a9fa164ebe
commit 154899586e
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/authorize_node.yml
View File

@ -2,7 +2,7 @@
- block: - block:
- name: Authorize new members to network - name: Authorize new members to network
uri: uri:
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local.zerotier.node_id }}" url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST method: POST
headers: headers:
Authorization: bearer {{ zerotier_api_accesstoken }} Authorization: bearer {{ zerotier_api_accesstoken }}
@ -14,11 +14,12 @@
register: auth_apiresult register: auth_apiresult
delegate_to: "{{ zerotier_api_delegate }}" delegate_to: "{{ zerotier_api_delegate }}"
when: when:
- ansible_local.zerotier.networks[zerotier_network_id] is not defined or ansible_local.zerotier.networks[zerotier_network_id].status != 'OK' - ansible_local['zerotier']['networks'][zerotier_network_id] is not defined or
ansible_local['zerotier']['networks'][zerotier_network_id]['status'] != 'OK'
- name: Configure members in network - name: Configure members in network
uri: uri:
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local.zerotier.node_id }}" url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST method: POST
headers: headers:
Authorization: bearer {{ zerotier_api_accesstoken }} Authorization: bearer {{ zerotier_api_accesstoken }}

2
tasks/install.yml
View File

@ -1,6 +1,6 @@
--- ---
- include_tasks: install/{{ ansible_os_family }}.yml - include_tasks: install/{{ ansible_facts['os_family'] }}.yml
tags: tags:
- installation - installation
- repositories - repositories

4
tasks/install/RedHat.yml
View File

@ -11,7 +11,7 @@
gpgcheck: yes gpgcheck: yes
enabled: yes enabled: yes
register: zerotier_repo register: zerotier_repo
when: ansible_distribution != "Fedora" when: ansible_facts['distribution'] != "Fedora"
- name: Add zerotier repo for Fedora - name: Add zerotier repo for Fedora
yum_repository: yum_repository:
@ -21,4 +21,4 @@
gpgcheck: yes gpgcheck: yes
enabled: yes enabled: yes
register: zerotier_repo register: zerotier_repo
when: ansible_distribution == "Fedora" when: ansible_facts['distribution'] == "Fedora"

6
tasks/main.yml
View File

@ -8,14 +8,14 @@
- name: Update ansible_local facts - name: Update ansible_local facts
script: set_facts.sh script: set_facts.sh
- name: Re-gather facts - name: Re-gather ansible_local facts
setup: ~ setup: filter=ansible_local
- import_tasks: authorize_node.yml - import_tasks: authorize_node.yml
when: when:
- zerotier_api_accesstoken | length > 0 - zerotier_api_accesstoken | length > 0
- ansible_local.zerotier.node_id is defined - ansible_local['zerotier']['node_id'] is defined
- import_tasks: join_network.yml - import_tasks: join_network.yml
when: when: