fix settings not merged

redhat-cop · Feb 8, 2024 · 2776254 · 2776254
1 parent 4488665
commit 2776254
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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, 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
@@ -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, 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
@@ -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, 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 }}"