openstack
/
openstack-ansible-os_zun
Code Issues Proposed changes

Merge "Enable recursion in combine() filter"

This commit is contained in:
Zuul 2022-01-26 20:25:15 +00:00 committed by Gerrit Code Review
parent 81c24da822 996dce8a8c
commit a246e6cf13
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
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:

2
vars/main.yml
View File

@ -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 %}