diff options
author | Giulio Fidente <gfidente@redhat.com> | 2016-02-18 13:55:23 +0100 |
---|---|---|
committer | Giulio Fidente <gfidente@redhat.com> | 2016-04-21 12:01:07 +0000 |
commit | 34b4954bc422016bc23b255807ed7d067c4fc56c (patch) | |
tree | 255ee0100d1987372243a4a2f8fbf27a2cd06af6 /puppet/compute.yaml | |
parent | 7588f749197624b0c37e98192ed10ac5434f6c6d (diff) |
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
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 6759d3b9..4c18067a 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -486,6 +486,7 @@ resources: - nova_nuage_data # Optionally provided by ComputeExtraConfigPre - midonet_data # Optionally provided by AllNodesExtraConfig - neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre + merge_behavior: deeper datafiles: compute_extraconfig: mapped_data: {get_param: NovaComputeExtraConfig} |