From 66b1aeb4bc858d0980071ff626dd772004ff104a Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dimitri.savineau@enovance.com>
Date: Thu, 30 Oct 2014 16:45:25 -0400
Subject: [PATCH] dashboard: Fix merge parameters

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>
---
 manifests/dashboard.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index 782bba43..295612c8 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -115,7 +115,7 @@ class cloud::dashboard(
     'add_listen' => true,
     'setenvif'   => $setenvif
   }
-  $vhost_extra_params_real = merge ($vhost_extra_params, $extra_params)
+  $vhost_extra_params_real = merge ($extra_params, $vhost_extra_params)
 
   $neutron_options = {
     'enable_lb' => true