Skip to content

Commit 447ebe2

Browse files
committed
Remove netbird_deployment_mode and simplify instance selection with netbird_mgmt_url
- Removed `netbird_deployment_mode` variable. - Updated logic to determine instance type based on `netbird_mgmt_url`.
1 parent d669485 commit 447ebe2

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
lines changed

roles/netbird/README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ Role Variables
1010
--------------
1111
- `netbird_setup_key`: The key that is used to automate the setup process.
1212
- `netbird_register`: A true/false defining whether or not register netbird.
13-
- `netbird_deployment_mode`: Specifies the deployment mode for Netbird. It can be either:
14-
- 'cloud-hosted': For deploying Netbird using the cloud-hosted instance.
15-
- 'self-hosted': For deploying a self-hosted instance of Netbird.
16-
- `netbird_mgmt_url`: The management URL for the self-hosted instance. This variable is required if `netbird_deployment_mode` is set to `'self-hosted'`.
13+
- `netbird_mgmt_url`: The management URL for the self-hosted instance. If not specified, defaults to the cloud-hosted instance (https://api.netbird.io:443).
1714

1815
Dependencies
1916
------------

roles/netbird/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
# defaults file for netbird
3-
netbird_deployment_mode: 'cloud-hosted'
3+
netbird_mgmt_url: https://api.netbird.io:443

roles/netbird/tasks/main.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
---
22
# tasks file for netbird
3-
- name: Check if self-hosted installation comes with a netbird_mgmt_url
4-
ansible.builtin.assert:
5-
that: netbird_mgmt_url is defined and netbird_mgmt_url != ''
6-
fail_msg: "The management URL must be defined and non-empty for self-hosted installations."
7-
when: deployment_mode == 'self-hosted'
8-
93
- name: Check for Netbird Installation
104
ansible.builtin.shell:
115
cmd: netbird version
@@ -22,20 +16,11 @@
2216
register: netbird_status
2317
changed_when: false
2418
ignore_errors: true
25-
when: netbird_deployment_mode is true
26-
27-
- name: Start Netbird (SaaS mode)
28-
become: true
29-
ansible.builtin.shell: netbird up --setup-key="{{ netbird_setup_key }}"
30-
when:
31-
- netbird_deployment_mode is true
32-
- "'NeedsLogin' in netbird_status.stdout or 'LoginFailed' in netbird_status.stdout"
33-
- deployment_mode == 'cloud-hosted'
19+
when: netbird_register is true
3420

35-
- name: Start Netbird (Self-Hosted mode)
21+
- name: Start Netbird
3622
become: true
3723
ansible.builtin.shell: netbird up --setup-key="{{ netbird_setup_key }}" --management-url="{{ netbird_mgmt_url }}"
38-
when:
39-
- netbird_deployment_mode is true
24+
when:
25+
- netbird_register is true
4026
- "'NeedsLogin' in netbird_status.stdout or 'LoginFailed' in netbird_status.stdout"
41-
- deployment_mode == 'self-hosted'

0 commit comments

Comments
 (0)