Combine, rather than replace init overrides

In I48a303d12e749e6d27a7f57c6f2dd93a98d16f9c the init override
used the update function, effectively replacing all contents of
cinder_environment_overrides which was not the intention. This
patch correctly applies the combine filter to merge the contents
instead, resulting in the cinder-volume service correctly able
to find the appropriate binary for cinder-rtstool in the path.

Change-Id: Ib4a432ec4437e9c75ee28eedd9a9fec30cf1b9a5
This commit is contained in:
Jesse Pretorius 2018-12-14 14:30:50 +00:00
parent 72685cb352
commit 098a747cd2
1 changed files with 1 additions and 1 deletions

View File

@ -62,7 +62,7 @@
{
'enabled': 'yes',
'state': 'started',
'config_overrides': cinder_environment_overrides.update(service.init_config_overrides)
'config_overrides': cinder_environment_overrides | combine(service.init_config_overrides)
}
)
%}