From 21e05cee88002bc44e2b7b2706c6f5b3827d723b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Trellu?= Date: Mon, 20 Nov 2023 20:06:29 -0500 Subject: [PATCH] [ansible] Move _os_type to vars --- ansible/roles/ovos_installer/tasks/docker/composer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/ovos_installer/tasks/docker/composer.yml b/ansible/roles/ovos_installer/tasks/docker/composer.yml index 20422280..dc28a22f 100644 --- a/ansible/roles/ovos_installer/tasks/docker/composer.yml +++ b/ansible/roles/ovos_installer/tasks/docker/composer.yml @@ -50,9 +50,10 @@ ovos_installer_display_server == 'N/A' - name: Define composition + vars: + _os_type: "{{ 'wls2' if ansible_kernel is search('microsoft') else 'linux' }}" ansible.builtin.set_fact: _composition_files: "{{ _composition_files | default([]) + [item.file] }}" - _os_type: "{{ 'wls2' if ansible_kernel is search('microsoft') else 'linux' }}" loop: - {"file": "docker-compose.yml", "state": "{{ 'true' if (ovos_installer_profile != 'satellite' and _os_type == 'linux') else 'false' }}"} - {"file": "docker-compose.windows.yml", "state": "{{ 'true' (if ovos_installer_profile != 'satellite' and _os_type == 'wsl2') else 'false' }}"}