From 1a089a22041dd1e61e48ac411b216460f41c7012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Inderm=C3=BChle?= Date: Mon, 19 Feb 2024 14:14:26 +0100 Subject: [PATCH] fix settings not merged (#47) --- group_vars/dev/main.yml | 2 +- group_vars/prod/main.yml | 2 +- group_vars/test/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/dev/main.yml b/group_vars/dev/main.yml index 7707bf2..be17c09 100644 --- a/group_vars/dev/main.yml +++ b/group_vars/dev/main.yml @@ -16,7 +16,7 @@ controller_organizations: "{{ controller_organizations_all + controller_organiza controller_projects: "{{ controller_projects_all + controller_projects_dev }}" controller_roles: "{{ controller_roles_all + controller_roles_dev }}" controller_schedules: "{{ controller_schedules_all + controller_schedules_dev }}" -controller_settings: "{{ controller_settings_all | combine(controller_settings_dev, list_merge='append') }}" +controller_settings: "{{ controller_settings_all | combine(controller_settings_dev, list_merge='append', recursive=true) }}" controller_teams: "{{ controller_teams_all + controller_teams_dev }}" controller_user_accounts: "{{ controller_user_accounts_all + controller_user_accounts_dev }}" controller_workflows: "{{ controller_workflows_all + controller_workflows_dev }}" diff --git a/group_vars/prod/main.yml b/group_vars/prod/main.yml index b77f5ba..a95e139 100644 --- a/group_vars/prod/main.yml +++ b/group_vars/prod/main.yml @@ -16,7 +16,7 @@ controller_organizations: "{{ controller_organizations_all + controller_organiza controller_projects: "{{ controller_projects_all + controller_projects_prod }}" controller_roles: "{{ controller_roles_all + controller_roles_prod }}" controller_schedules: "{{ controller_schedules_all + controller_schedules_prod }}" -controller_settings: "{{ controller_settings_all | combine(controller_settings_prod, list_merge='append') }}" +controller_settings: "{{ controller_settings_all | combine(controller_settings_prod, list_merge='append', recursive=true) }}" controller_teams: "{{ controller_teams_all + controller_teams_prod }}" controller_user_accounts: "{{ controller_user_accounts_all + controller_user_accounts_prod }}" controller_workflows: "{{ controller_workflows_all + controller_workflows_prod }}" diff --git a/group_vars/test/main.yml b/group_vars/test/main.yml index 059cf75..808c39a 100644 --- a/group_vars/test/main.yml +++ b/group_vars/test/main.yml @@ -16,7 +16,7 @@ controller_organizations: "{{ controller_organizations_all + controller_organiza controller_projects: "{{ controller_projects_all + controller_projects_test }}" controller_roles: "{{ controller_roles_all + controller_roles_test }}" controller_schedules: "{{ controller_schedules_all + controller_schedules_test }}" -controller_settings: "{{ controller_settings_all | combine(controller_settings_test, list_merge='append') }}" +controller_settings: "{{ controller_settings_all | combine(controller_settings_test, list_merge='append', recursive=true) }}" controller_teams: "{{ controller_teams_all + controller_teams_test }}" controller_user_accounts: "{{ controller_user_accounts_all + controller_user_accounts_test }}" controller_workflows: "{{ controller_workflows_all + controller_workflows_test }}"