openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Giulio Fidente 2016-02-18 13:55:23 +01:00
parent 7588f74919
commit 34b4954bc4
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/ceph-storage.yaml
View File

@ -256,6 +256,7 @@ resources:
- ceph
- '"%{::osfamily}"'
- common
merge_behavior: deeper
datafiles:
common:
raw_data: {get_file: hieradata/common.yaml}

1
puppet/cinder-storage.yaml
View File

@ -316,6 +316,7 @@ resources:
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- common
merge_behavior: deeper
datafiles:
common:
raw_data: {get_file: hieradata/common.yaml}

1
puppet/compute.yaml
View File

@ -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}

1
puppet/controller.yaml
View File

@ -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}

1
puppet/swift-storage.yaml
View File

@ -256,6 +256,7 @@ resources:
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- common
merge_behavior: deeper
datafiles:
common:
raw_data: {get_file: hieradata/common.yaml}