From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 30 Jul 2016 17:51:04 +0000 (+0200)
Subject: fix onion_global_service_hostname
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e6de83530f92f97f19b4eeeb6062fa85c5e49fba;p=mirror%2Fdsa-puppet.git

fix onion_global_service_hostname
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
index 41e160d4f..22ee3bbbe 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/onion_global_service_hostname.rb
@@ -16,7 +16,8 @@ module Puppet::Parser::Functions
     require 'json'
     parsed = {}
     facts.each_line do |l|
-      p.update(JSON.parse(l))
+      p = JSON.parse(l)
+      parsed.update(p) if p
     end
     return parsed[servicename]
   end