From: David Gurtner <aldavud@crimson.ch>
Date: Mon, 20 Feb 2017 17:50:54 +0000 (+0100)
Subject: Replace default to be more robust
X-Git-Tag: opnfv-6.0.0~328^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f8313f755c56b2cf614605588f8164c510b18956;p=apex-puppet-tripleo.git

Replace default to be more robust

Specifying undef as the fallback only works because the merge
function specifically checks for this:
next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef

But the empty Hash would be a much more robust default.

Change-Id: I7e302c00ef030d75998e352d88b3ccc60b194ab7
---

diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index 1849435..278c25c 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -25,11 +25,11 @@
 #
 # [*neutron_options*]
 #   (Optional) A hash of parameters to enable features specific to Neutron
-#   Defaults to hiera('horizon::neutron_options', undef)
+#   Defaults to hiera('horizon::neutron_options', {})
 #
 class tripleo::profile::base::horizon (
   $step            = hiera('step'),
-  $neutron_options = hiera('horizon::neutron_options', undef),
+  $neutron_options = hiera('horizon::neutron_options', {}),
 ) {
   if $step >= 4 {
     # Horizon