Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix settings not merged #47

Merged
merged 2 commits into from
Feb 19, 2024
Merged

fix settings not merged #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2776254
fix settings not merged
laurent-indermuehle Feb 8, 2024
f74b170
Add back list_merge in addition to recursive
laurent-indermuehle Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion group_vars/dev/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion group_vars/prod/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion group_vars/test/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Loading