From 996dce8a8c45e3b123d234678024cd113540fbe2 Mon Sep 17 00:00:00 2001 From: Damian Dabrowski Date: Tue, 11 Jan 2022 19:13:09 +0100 Subject: [PATCH] Enable recursion in combine() filter Ansible's combine() filter needs recursive=True parameter in order to recursively merge nested hashes. https: //docs.ansible.com/ansible/latest/user_guide/playbooks_filters.html#combining-hashes-dictionaries Change-Id: Ie081e4e9bdf84e0f3c1f0116fcd6c76e47573895 --- defaults/main.yml | 4 ++-- vars/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 535f184..fd80937 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -257,7 +257,7 @@ zun_services: group: zun_compute service_name: kuryr-libnetwork condition: "{{ inventory_hostname in groups['zun_compute'] }}" - init_config_overrides: "{{ zun_kuryr_init_defaults | combine(zun_kuryr_init_overrides) }}" + init_config_overrides: "{{ zun_kuryr_init_defaults | combine(zun_kuryr_init_overrides, recursive=True) }}" start_order: 3 wsgi_app: True wsgi: kuryr_libnetwork.server:app @@ -308,7 +308,7 @@ zun_services: init_config_overrides: {} start_order: 4 systemd_overrides_only: True - systemd_overrides: "{{ zun_docker_init_defaults | combine(zun_docker_init_overrides) }}" + systemd_overrides: "{{ zun_docker_init_defaults | combine(zun_docker_init_overrides, recursive=True) }}" # Common pip packages zun_pip_packages: diff --git a/vars/main.yml b/vars/main.yml index d8ff282..8e6e8a5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -25,7 +25,7 @@ filtered_zun_services: |- ('condition' in value and value['condition'])) and not ('wsgi_app' in value and value['wsgi_app']) %} {% set _ = value.update({'enabled': 'yes', 'state': 'started'}) %} - {% set _ = value.update({'config_overrides': (zun_service_defaults | combine(value.init_config_overrides))}) %} + {% set _ = value.update({'config_overrides': (zun_service_defaults | combine(value.init_config_overrides, recursive=True))}) %} {% set _ = value.pop('init_config_overrides') %} {% set _ = services.append(value) %} {% endif %}