Netdata: Reorder tasks, use var for socket proxy name

saltyorg · Feb 5, 2024 · a2c5be1 · a2c5be1
1 parent d03d8dc
commit a2c5be1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/roles/netdata/defaults/main.yml b/roles/netdata/defaults/main.yml
@@ -93,7 +93,7 @@ netdata_docker_ports: "{{ netdata_docker_ports_defaults
 netdata_docker_envs_default:
   PGID: "{{ gid }}"
   TZ: "{{ tz }}"
-  DOCKER_HOST: "netdata-docker-socket-proxy:2375"
+  DOCKER_HOST: "{{ netdata_name }}-docker-socket-proxy:2375"
   NETDATA_CLAIM_TOKEN: "{{ netdata_claim_token }}"
   NETDATA_CLAIM_URL: "{{ netdata_claim_url }}"
   NETDATA_CLAIM_ROOMS: "{{ netdata_claim_room }}"

diff --git a/roles/netdata/tasks/main.yml b/roles/netdata/tasks/main.yml
@@ -7,20 +7,20 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
+- name: Create Docker Socket Proxy container
+  ansible.builtin.include_role:
+    name: docker_socket_proxy
+  vars:
+    docker_socket_proxy_name: "{{ netdata_name }}-docker-socket-proxy"
+    docker_socket_proxy_docker_envs_custom: "{{ netdata_docker_socket_proxy_envs }}"
+
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"
   vars:
     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"
     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"
     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"
 
-- name: Create Docker Socket Proxy container
-  ansible.builtin.include_role:
-    name: docker_socket_proxy
-  vars:
-    docker_socket_proxy_name: "netdata-docker-socket-proxy"
-    docker_socket_proxy_docker_envs_custom: "{{ netdata_docker_socket_proxy_envs }}"
-
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"