mcrouter: allow variable overrides in each instance

saltyorg · Jan 14, 2024 · 6c1ac81 · 6c1ac81
1 parent e358f99
commit 6c1ac81
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/roles/mcrouter/defaults/main.yml b/roles/mcrouter/defaults/main.yml
@@ -53,7 +53,7 @@ mcrouter_docker_envs: "{{ mcrouter_docker_envs_default
 
 # Commands
 mcrouter_docker_commands_default:
-  - "--mapping={% for item in minecraft_instances %}{{ lookup('vars', item + '_web_subdomain', default=item) }}.{{ user.domain }}={{ lookup('vars', item + '_web_subdomain', default=item) }}:25565{{ '' if loop.last else ',' }}{% endfor %}"
+  - "--mapping={{ mcrouter_mapping[:-1] }}"
 mcrouter_docker_commands_custom: []
 mcrouter_docker_commands: "{{ mcrouter_docker_commands_default
                               + mcrouter_docker_commands_custom }}"

diff --git a/roles/mcrouter/tasks/main.yml b/roles/mcrouter/tasks/main.yml
@@ -7,12 +7,21 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
-
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
 
 - name: Create directories
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"
 
+- name: Define 'mcrouter_mapping'
+  ansible.builtin.set_fact:
+    mcrouter_mapping: "{{ mcrouter_mapping | default('')
+      + lookup('vars', minecraft_name + '_web_subdomain', default=minecraft_web_subdomain) + '.'
+      + lookup('vars', minecraft_name + '_web_domain', default=minecraft_web_domain)
+      + '=' + lookup('vars', minecraft_name + '_docker_hostname', default=minecraft_docker_hostname) + ':25565,' }}"
+  loop: "{{ minecraft_instances }}"
+  loop_control:
+    loop_var: minecraft_name
+
 - name: Create Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"