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

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index f26d07f..f0eb71e 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -256,6 +256,7 @@ resources:
             - ceph
             - '"%{::osfamily}"'
             - common
+          merge_behavior: deeper
           datafiles:
             common:
               raw_data: {get_file: hieradata/common.yaml}

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 5b61e0b..c1a04e2 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -316,6 +316,7 @@ resources:
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - common
+          merge_behavior: deeper
           datafiles:
             common:
               raw_data: {get_file: hieradata/common.yaml}

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 6759d3b..4c18067 100644 (file)
--- 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}

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index dcfe094..f7e5084 100644 (file)
--- 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}

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index ea22626..296428d 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -256,6 +256,7 @@ resources:
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - common
+          merge_behavior: deeper
           datafiles:
             common:
               raw_data: {get_file: hieradata/common.yaml}