From a5cd9eeb21c03cd25347eb2018f28923ecbc4899 Mon Sep 17 00:00:00 2001 From: Sascha Doering Date: Tue, 13 Nov 2018 16:40:07 +0100 Subject: [PATCH] Fix the condition for upstream members The condition which decides if we have upstream members configurred or if we import from PuppetDB was wrong. Even if no upstream members are defined the condition was true. Fixes GH-1274 (cherry picked from commit 30bd2a787f6284812a0a3b2e637fb09acee43964 on syseleven/1274_fix_upstream_member_condition) --- manifests/resource/upstream.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp index d3665b2d0..0d5153bb1 100644 --- a/manifests/resource/upstream.pp +++ b/manifests/resource/upstream.pp @@ -134,7 +134,7 @@ }), } - if $members != undef { + if ! empty($members) { $members.each |$member,$values| { $member_values = merge($member_defaults,$values,{'upstream' => $name,'context' => $context})