old-style roles are gone

diff --git a/modules/deprecated/manifests/init.pp b/modules/deprecated/manifests/init.pp
index f3a8afe..f29c765 100644 (file)
--- a/modules/deprecated/manifests/init.pp
+++ b/modules/deprecated/manifests/init.pp
@@ -3,5 +3,4 @@ class deprecated {
        $localinfo = yamlinfo('*')
        $nodeinfo  = nodeinfo($::fqdn)
        $allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
-        $roles = hiera('roles')
 }

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
deleted file mode 100644 (file)
index eef31b9..0000000
--- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:has_role, :type => :rvalue) do |args|
-      role = args[0]
-      roles = lookupvar('deprecated::roles')
-      fqdn = lookupvar('fqdn')
-      if not roles.include?(role)
-        err "Failed to look up missing role #{role}"
-        return false
-      end
-      case roles[role]
-        when Hash then roles[role].include?(fqdn)
-        else roles[role].map{ |k|
-               case k
-                 when Hash then k.keys.first
-                 else k
-               end
-             }.include?(fqdn)
-      end
-  end
-end

diff --git a/modules/roles/templates/sso_rp/ca.crl.erb b/modules/roles/templates/sso_rp/ca.crl.erb
index a10d51e..ecdf1c4 100644 (file)
--- a/modules/roles/templates/sso_rp/ca.crl.erb
+++ b/modules/roles/templates/sso_rp/ca.crl.erb
@@ -11,7 +11,6 @@ end
 
 crl = []
 
-roles = scope.lookupvar('deprecated::roles')
 ['diabelli.debian.org'].each do |node|
   c = getcrl(node)
   next if c.nil?

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index efb9391..311144a 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -1,6 +1,5 @@
 <%
   allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
-  roles = scope.lookupvar('deprecated::roles')
 %>
 
 # local admin