summaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 49dbfa53..04ce1c34 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1213,6 +1213,7 @@ resources:
- midonet_data #Optionally provided by AllNodesExtraConfig
- neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre
- neutron_plumgrid_data # Optionally provided by ControllerExtraConfigPre
+ merge_behavior: deeper
datafiles:
service_configs:
mapped_data: {get_param: ServiceConfigSettings}