support limit-mirrors in has_static_component
authorPeter Palfrader <peter@palfrader.org>
Sun, 12 Feb 2017 16:36:50 +0000 (17:36 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 12 Feb 2017 16:36:50 +0000 (17:36 +0100)
modules/puppetmaster/lib/puppet/parser/functions/has_static_component.rb

index cd04cdc..ded96ce 100644 (file)
@@ -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