X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fhas_static_component.rb;h=ded96ceee469c3025c87a4b6de9692349251cca7;hb=a7016fcb7d27ba652c9bbcf800021000c2c17420;hp=cd04cdc11b05081c4a7c9c72f4a58089615040ac;hpb=26bc980392c5213fd04962602529c04493f8dcb7;p=mirror%2Fdsa-puppet.git diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_static_component.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_static_component.rb index cd04cdc11..ded96ceee 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/has_static_component.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/has_static_component.rb @@ -19,12 +19,10 @@ module Puppet::Parser::Functions if cfg.include?('components') if cfg['components'].include?(static_component) - if cfg['components'][static_component].include?('exclude-mirrors') - if cfg['components'][static_component]['exclude-mirrors'].include?(fqdn) - return false - else - return true - end + if cfg['components'][static_component].include?('limit-mirrors') + return (cfg['components'][static_component]['limit-mirrors'].include?(fqdn)) + elsif cfg['components'][static_component].include?('exclude-mirrors') + return (not cfg['components'][static_component]['exclude-mirrors'].include?(fqdn)) else return true end