From 0a0776df36165b7a0396caec920a75d473bdfca1 Mon Sep 17 00:00:00 2001
From: Damian Dabrowski <damian@dabrowski.cloud>
Date: Tue, 11 Jan 2022 19:22:07 +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: I2e84c0370c04336c124e5b6549b638483f107601
---
 defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 331c875f..9f2db321 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -432,7 +432,7 @@ nova_services:
   nova-api-os-compute:
     group: nova_api_os_compute
     service_name: nova-api-os-compute
-    init_config_overrides: "{{ {'Install': {'Alias': 'nova-api.service'}} | combine(nova_api_os_compute_init_overrides) }}"
+    init_config_overrides: "{{ {'Install': {'Alias': 'nova-api.service'}} | combine(nova_api_os_compute_init_overrides, recursive=True) }}"
     start_order: 4
     wsgi_app: True
     uwsgi_overrides: "{{ nova_api_os_compute_uwsgi_ini_overrides }}"
@@ -474,7 +474,7 @@ nova_services:
   nova-spicehtml5proxy:
     group: nova_console
     service_name: nova-spicehtml5proxy
-    init_config_overrides: "{{ {'Install': {'Alias': 'nova-spiceproxy.service'}} | combine(nova_spicehtml5proxy_init_overrides) }}"
+    init_config_overrides: "{{ {'Install': {'Alias': 'nova-spiceproxy.service'}} | combine(nova_spicehtml5proxy_init_overrides, recursive=True) }}"
     condition: "{{ nova_console_type == 'spice' }}"
     start_order: 5
     execstarts: "{{ nova_bin }}/nova-spicehtml5proxy"