From c4c9a52df83e66cd9ed5039f66756529e06c6416 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Fri, 2 Feb 2018 06:49:53 +0100 Subject: [PATCH] Fix has_role to handle richer data structures properly --- .../puppetmaster/lib/puppet/parser/functions/has_role.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb index c8b537f79..5c1af8e04 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb @@ -7,6 +7,11 @@ module Puppet::Parser::Functions err "Failed to look up missing role #{role}" return false end - return roles[role].include?(fqdn) + return roles[role].map{ |k| + case k + when Hash then k.keys.first + else k + end + }.include?(fqdn) end end -- 2.20.1