From 34b4954bc422016bc23b255807ed7d067c4fc56c Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 18 Feb 2016 13:55:23 +0100 Subject: Use 'deeper' hiera_hash merge behavior for all roles This change configures the hiera merge behavior to 'deeper' [1], which is useful to merge values when the same hiera key is found in multiple datafiles. The hiera default 'native' only picks the value from the key with the highest priority in the hierarchy. 1. https://docs.puppetlabs.com/hiera/1/lookup_types.html#deep-merging-in-hiera--120 Change-Id: I88c764d9af510ffbbad9fcaa4b747655e38255c2 --- puppet/controller.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/controller.yaml') diff --git a/puppet/controller.yaml b/puppet/controller.yaml index dcfe094d..f7e50846 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1208,6 +1208,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} -- cgit 1.2.3-korg