stackforge/puppet-openstack-cloud
Code Issues Proposed changes

dashboard: Fix merge parameters

Browse Source 
When there is a duplicate key, the key in the rightmost hash will "win."
Currently extra_params default values can never be overriden by
vhost_extra_params if we have duplicate key.
This patch allows it.

https://forge.puppetlabs.com/puppetlabs/stdlib#merge

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
This commit is contained in:
Dimitri Savineau
2014-10-30 16:45:25 -04:00
parent 794025c6ab
commit 66b1aeb4bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/dashboard.pp
View File

@@ -115,7 +115,7 @@ class cloud::dashboard(
'add_listen' => true, 'add_listen' => true,
'setenvif' => $setenvif 'setenvif' => $setenvif
} }
$vhost_extra_params_real = merge ($vhost_extra_params, $extra_params) $vhost_extra_params_real = merge ($extra_params, $vhost_extra_params)
$neutron_options = { $neutron_options = {
'enable_lb' => true 'enable_lb' => true