update controller api to support new routes

This commit is contained in:
2024-10-07 21:54:26 +05:30
parent ca3cc077d6
commit bd13f3a938
10 changed files with 93 additions and 93 deletions

View File

@@ -1,39 +1,39 @@
---
- block:
- name: Authorize new members to network
uri:
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST
headers:
Authorization: bearer {{ zerotier_api_accesstoken }}
body:
hidden: false
config:
authorized: "{{ zerotier_authorize_member }}"
body_format: json
register: auth_apiresult
delegate_to: "{{ zerotier_api_delegate }}"
when:
- ansible_local['zerotier']['networks'][zerotier_network_id] is not defined or
ansible_local['zerotier']['networks'][zerotier_network_id]['status'] != 'OK'
- name: Authorize new members to network
uri:
url: "{{ zerotier_api_url }}/api/v1/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST
headers:
Authorization: bearer {{ zerotier_api_accesstoken }}
body:
hidden: false
config:
authorized: "{{ zerotier_authorize_member }}"
body_format: json
register: auth_apiresult
delegate_to: "{{ zerotier_api_delegate }}"
when:
- 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
uri:
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST
headers:
Authorization: bearer {{ zerotier_api_accesstoken }}
body:
name: "{{ zerotier_member_register_short_hostname | ternary(inventory_hostname_short, inventory_hostname) }}"
description: "{{ zerotier_member_description | default() }}"
config:
ipAssignments: "{{ zerotier_member_ip_assignments | default([]) | list }}"
body_format: json
register: conf_apiresult
delegate_to: "{{ zerotier_api_delegate }}"
- name: Configure members in network
uri:
url: "{{ zerotier_api_url }}/api/v1/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
method: POST
headers:
Authorization: bearer {{ zerotier_api_accesstoken }}
body:
name: "{{ zerotier_member_register_short_hostname | ternary(inventory_hostname_short, inventory_hostname) }}"
description: "{{ zerotier_member_description | default() }}"
config:
ipAssignments: "{{ zerotier_member_ip_assignments | default([]) | list }}"
body_format: json
register: conf_apiresult
delegate_to: "{{ zerotier_api_delegate }}"
when:
- not ansible_check_mode
- not ansible_check_mode
tags:
- configuration
- configuration
become: false

View File

@@ -1,30 +1,29 @@
---
- include_tasks: install/{{ ansible_facts['os_family'] }}.yml
tags:
- installation
- repositories
- installation
- repositories
- block: #Install and enable zerotier-one
- name: Install zerotier-one
package:
name: zerotier-one
state: present
update_cache: yes
register: zerotier_client
- name: Install zerotier-one
package:
name: zerotier-one
state: present
update_cache: yes
register: zerotier_client
- name: Start zerotier-one service
service:
name: zerotier-one
state: started
when:
- zerotier_client is succeeded
notify:
- enable zerotier-one
- name: Start zerotier-one service
service:
name: zerotier-one
state: started
when:
- zerotier_client is succeeded
notify:
- enable zerotier-one
when:
- zerotier_repo is not defined or zerotier_repo is succeeded
- not ansible_check_mode
- zerotier_repo is not defined or zerotier_repo is succeeded
- not ansible_check_mode
tags:
- installation
- packages
- installation
- packages

View File

@@ -12,12 +12,12 @@
register: release_repo
- block:
- name: Overwrite Ubuntu release repo name
set_fact:
zerotier_deb_release_repo: bionic
- name: Overwrite Ubuntu release repo name
set_fact:
zerotier_deb_release_repo: bionic
- name: Re-gather facts
setup: ~
- name: Re-gather facts
setup: ~
when:
- ansible_facts['distribution'] == "Ubuntu"

View File

@@ -4,4 +4,4 @@
args:
creates: /var/lib/zerotier-one/networks.d/{{ zerotier_network_id }}.conf
tags:
- configuration
- configuration

View File

@@ -2,21 +2,20 @@
# tasks file for ansible-role-zerotier
- import_tasks: install.yml
when:
- not skip_install | default(false) | bool
- not skip_install | default(false) | bool
- block:
- name: Update ansible_local facts
script: set_facts.sh
- name: Re-gather ansible_local facts
setup: filter=ansible_local
- name: Update ansible_local facts
script: set_facts.sh
- name: Re-gather ansible_local facts
setup: filter=ansible_local
- import_tasks: authorize_node.yml
when:
- zerotier_api_accesstoken | length > 0
- ansible_local['zerotier']['node_id'] is defined
- zerotier_api_accesstoken | length > 0
- ansible_local['zerotier']['node_id'] is defined
- import_tasks: join_network.yml
when:
- zerotier_network_id is defined
- zerotier_network_id is defined