From 098a747cd25b4f90e93adebff19c5643719e171e Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 14 Dec 2018 14:30:50 +0000 Subject: [PATCH] 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 --- tasks/cinder_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml index ff7c781d..f06cbaff 100644 --- a/tasks/cinder_install.yml +++ b/tasks/cinder_install.yml @@ -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) } ) %}