From 2e2a6a3b1a42ca3351676096fdaa9f642894cdc8 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 2 Jan 2014 19:52:10 +0000 Subject: [PATCH 1/1] try to fix errors Signed-off-by: Stephen Gran --- modules/ferm/templates/me.conf.erb | 6 +++--- .../puppetmaster/lib/puppet/parser/functions/has_role.rb | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 7e84414b0..ea1b87852 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -5,7 +5,6 @@ <%= nodeinfo = scope.lookupvar('site::nodeinfo') -has_role = scope.function_has_role out = [] restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost'] @@ -45,10 +44,11 @@ if restrict_ssh.include?(hostname) then ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya end - if has_role('static_master') then + if scope.function_has_role('static_master') then ssh4allowed << '$HOST_STATIC_V4' ssh6allowed << '$HOST_STATIC_V6' - elsif has_role('static_source') or has_role('static_mirror') then + elsif scope.function_has_role('static_source') or + scope.function_has_role('static_mirror') then ssh4allowed << '$HOST_STATICMASTER_V4' ssh6allowed << '$HOST_STATICMASTER_V6' end diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb index 4527e34f8..ecb3cabc6 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb @@ -1,14 +1,12 @@ module Puppet::Parser::Functions newfunction(:has_role, :type => :rvalue) do |args| - begin role = args.shift roles = lookupvar('site::roles') fqdn = lookupvar('fqdn') if not roles.include?(role) err "Failed to look up missing role #{role}" - return False + return false end return roles[role].include?(fqdn) end - end end -- 2.20.1