openstack/openstack-ansible-os_zun
Code Issues Proposed changes

Enable recursion in combine() filter

Browse Source 
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
This commit is contained in:
Damian Dabrowski 2022-01-11 19:13:09 +01:00
parent 6b1c3f831a
commit 996dce8a8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -257,7 +257,7 @@ zun_services:
group: zun_compute group: zun_compute
service_name: kuryr-libnetwork service_name: kuryr-libnetwork
condition: "{{ inventory_hostname in groups['zun_compute'] }}" 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 start_order: 3
wsgi_app: True wsgi_app: True
wsgi: kuryr_libnetwork.server:app wsgi: kuryr_libnetwork.server:app
@ -308,7 +308,7 @@ zun_services:
init_config_overrides: {} init_config_overrides: {}
start_order: 4 start_order: 4
systemd_overrides_only: True 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 # Common pip packages
zun_pip_packages: zun_pip_packages:

2
vars/main.yml
View File

@ -25,7 +25,7 @@ filtered_zun_services: |-
('condition' in value and value['condition'])) ('condition' in value and value['condition']))
and not ('wsgi_app' in value and value['wsgi_app']) %} and not ('wsgi_app' in value and value['wsgi_app']) %}
{% set _ = value.update({'enabled': 'yes', 'state': 'started'}) %} {% 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 _ = value.pop('init_config_overrides') %}
{% set _ = services.append(value) %} {% set _ = services.append(value) %}
{% endif %} {% endif %}