From bd13f3a9388be6e735f763ef444b7484be48eebc Mon Sep 17 00:00:00 2001 From: Malar Invention Date: Mon, 7 Oct 2024 21:54:26 +0530 Subject: [PATCH] update controller api to support new routes --- .travis.yml | 2 +- README.md | 1 + defaults/main.yml | 2 +- meta/main.yml | 45 ++++++++++++++-------------- tasks/authorize_node.yml | 64 ++++++++++++++++++++-------------------- tasks/install.yml | 41 +++++++++++++------------ tasks/install/Debian.yml | 10 +++---- tasks/join_network.yml | 2 +- tasks/main.yml | 17 +++++------ vars/main.yml | 2 +- 10 files changed, 93 insertions(+), 93 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49e7e1c..121cc49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ sudo: false addons: apt: packages: - - python-pip + - python-pip install: # Install ansible diff --git a/README.md b/README.md index 6e3d065..1f6bb8a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[TODO] Update build [![Build Status](https://travis-ci.org/m4rcu5nl/ansible-role-zerotier.svg?branch=master)](https://travis-ci.org/m4rcu5nl/ansible-role-zerotier) [![GitHub issues](https://img.shields.io/github/issues/m4rcu5nl/ansible-role-zerotier.svg)](https://github.com/m4rcu5nl/ansible-role-zerotier/issues) ZeroTier diff --git a/defaults/main.yml b/defaults/main.yml index ae8b479..428bf35 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for ansible-role-zerotier zerotier_api_accesstoken: "{{ zerotier_accesstoken | default() }}" # For backwards compatibility -zerotier_api_url: https://my.zerotier.com +zerotier_api_url: https://api.zerotier.com zerotier_api_delegate: localhost zerotier_apt_state: present zerotier_member_register_short_hostname: "{{ zerotier_register_short_hostname | default(false) }}" # For backwards compatibility diff --git a/meta/main.yml b/meta/main.yml index 7640ef6..8c6acd3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -33,19 +33,19 @@ galaxy_info: # platforms is a list of platforms, and each platform has a name and a list of versions. # platforms: - - name: EL - versions: - - 7 - - name: Debian - versions: - - stretch - - name: Ubuntu - versions: - - Bionic - - Cosmic - - name: Fedora - versions: - - 28 + - name: EL + versions: + - 7 + - name: Debian + versions: + - stretch + - name: Ubuntu + versions: + - Bionic + - Cosmic + - name: Fedora + versions: + - 39 # - name: SomePlatform # versions: # - all @@ -54,15 +54,16 @@ galaxy_info: # - 99.99 galaxy_tags: - - zerotier - - networking - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. + - zerotier + - networking + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. -dependencies: [] +dependencies: + [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. diff --git a/tasks/authorize_node.yml b/tasks/authorize_node.yml index c094036..7fc30a6 100644 --- a/tasks/authorize_node.yml +++ b/tasks/authorize_node.yml @@ -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 diff --git a/tasks/install.yml b/tasks/install.yml index 8d07188..0754e48 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -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 diff --git a/tasks/install/Debian.yml b/tasks/install/Debian.yml index 1a236db..a048a2a 100644 --- a/tasks/install/Debian.yml +++ b/tasks/install/Debian.yml @@ -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" diff --git a/tasks/join_network.yml b/tasks/join_network.yml index ab151cf..7be5fb7 100644 --- a/tasks/join_network.yml +++ b/tasks/join_network.yml @@ -4,4 +4,4 @@ args: creates: /var/lib/zerotier-one/networks.d/{{ zerotier_network_id }}.conf tags: - - configuration + - configuration diff --git a/tasks/main.yml b/tasks/main.yml index 29183f9..31c4e03 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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 diff --git a/vars/main.yml b/vars/main.yml index fd0278b..ed56422 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -3,4 +3,4 @@ zerotier_download_base_url: http://download.zerotier.com zerotier_deb_release_repo: "{{ ansible_facts['distribution_release'] }}" zerotier_gpg_url: https://download.zerotier.com/contact@zerotier.com.gpg -zerotier_gpg_fingerprint: 74A5E9C458E1A431F1DA57A71657198823E52A61 \ No newline at end of file +zerotier_gpg_fingerprint: 74A5E9C458E1A431F1DA57A71657198823E52A61 -- 2.40.1