check for string 'undef'

workaround bug where hiera does not properly return undef
epost-dev · Oct 11, 2016 · a3bef23 · a3bef23
1 parent 5c8ccdc
commit a3bef23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -123,7 +123,7 @@
   # Todo: Use Serviceip from HA-Setup if ha enabled.
   $oned_onegate_ip = hiera('one::oned::onegate::ip', $::ipaddress)
   # Specify full endpoint if needed (such as if using https proxy)
-  $oned_onegate_endpoint = hiera('one::oned::onegate::endpoint', undef)
+  $oned_onegate_endpoint = hiera('one::oned::onegate::endpoint', 'undef')
 
   # E-POST imaginator parameters
   $kickstart_network         = hiera ('one::node::kickstart::network', undef)

diff --git a/templates/oned.conf.erb b/templates/oned.conf.erb
@@ -899,7 +899,7 @@ DEFAULT_UMASK = 177
 #   MUST be consistent with the values in onegate-server.conf
 #*******************************************************************************
 
-<% if scope.lookupvar('one::oned_onegate_endpoint') -%>
+<% if scope.lookupvar('one::oned_onegate_endpoint') != 'undef' -%>
 ONEGATE_ENDPOINT = "<%= scope.lookupvar('one::oned_onegate_endpoint') %>"
 <% elsif scope.lookupvar('one::oned_onegate_ip') -%>
 ONEGATE_ENDPOINT = "http://<%= scope.lookupvar('one::oned_onegate_ip') %>:5030"