Skip to content

Commit 437c49c

Browse files
committed
Netdata: Reorder tasks, use var for socket proxy name
1 parent ae8ef65 commit 437c49c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

roles/netdata/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ netdata_docker_ports: "{{ netdata_docker_ports_defaults
9393
netdata_docker_envs_default:
9494
PGID: "{{ gid }}"
9595
TZ: "{{ tz }}"
96-
DOCKER_HOST: "netdata-docker-socket-proxy:2375"
96+
DOCKER_HOST: "{{ netdata_name }}-docker-socket-proxy:2375"
9797
NETDATA_CLAIM_TOKEN: "{{ netdata_claim_token }}"
9898
NETDATA_CLAIM_URL: "{{ netdata_claim_url }}"
9999
NETDATA_CLAIM_ROOMS: "{{ netdata_claim_room }}"

roles/netdata/tasks/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
# GNU General Public License v3.0 #
88
#########################################################################
99
---
10+
- name: Create Docker Socket Proxy container
11+
ansible.builtin.include_role:
12+
name: docker_socket_proxy
13+
vars:
14+
docker_socket_proxy_name: "{{ netdata_name }}-docker-socket-proxy"
15+
docker_socket_proxy_docker_envs_custom: "{{ netdata_docker_socket_proxy_envs }}"
16+
1017
- name: Add DNS record
1118
ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
1219
vars:
1320
dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"
1421
dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"
1522
dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"
1623

17-
- name: Create Docker Socket Proxy container
18-
ansible.builtin.include_role:
19-
name: docker_socket_proxy
20-
vars:
21-
docker_socket_proxy_name: "netdata-docker-socket-proxy"
22-
docker_socket_proxy_docker_envs_custom: "{{ netdata_docker_socket_proxy_envs }}"
23-
2424
- name: Remove existing Docker container
2525
ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
2626

0 commit comments

Comments
 (0)