diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-25 19:20:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-25 19:20:15 +0000 |
| commit | 16cb316f691169869956ed58efc41db8b5ebcccb (patch) | |
| tree | 944ee4b2e2913db25cdf91b8b4ab4647359f56df /puppet/controller.yaml | |
| parent | f7113ee7b0e2c84779ae88ab927b95426c10d4a0 (diff) | |
| parent | 34b4954bc422016bc23b255807ed7d067c4fc56c (diff) | |
Merge "Use 'deeper' hiera_hash merge behavior for all roles"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 1 |
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} |