Added IAM support

manifests/atlas.pp

@@ -12,6 +12,7 @@
 #
 # CERN IT/GT/DMS <[email protected]>
 # CERN IT/PS/PES <[email protected]>
+# Adam Boutcher IPPP, Durham University <[email protected]>
 
 class voms::atlas {
   voms::client{'atlas':
@@ -24,6 +25,11 @@
                     port   => '15001',
                     dn    => '/DC=ch/DC=cern/OU=computers/CN=lcg-voms.cern.ch',
                     ca_dn => '/DC=ch/DC=cern/CN=CERN Trusted Certification Authority'
+                   },
+                   {server => 'voms-atlas-auth.app.cern.ch',
+                    port   => '0',
+                    dn     => '/DC=ch/DC=cern/OU=computers/CN=atlas-auth.web.cern.ch',
+                    ca_dn  => '/DC=ch/DC=cern/CN=CERN Grid Certification Authority'
                    }]
  }
 }

manifests/client.pp

@@ -11,7 +11,8 @@
 
 # [*servers*]
 #   An array of hashes. For each VOMS server 
-#   specify server name (server), its port (port), 
+#   specify server name (server), its port (port) - 0 (Zero)
+#   indicates an IAM auth not voms,
 #   its distinguished name (dn) and it's certificate 
 #   authority distinguished name (ca_dn) as keys to the hash.
 
@@ -27,12 +28,19 @@
 #                   port   => '15009',
 #                   dn    => '/DC=ch/DC=cern/OU=computers/CN=lcg-voms.cern.ch',
 #                   ca_dn => '/DC=ch/DC=cern/CN=CERN Trusted Certification Authority'
+#                  },
+#                  {server => 'lcg-voms-auth.app.cern.ch',
+#                   port   => '443',
+#                   dn    => '/DC=ch/DC=cern/OU=computers/CN=lcg-voms-app.web.cern.ch',
+#                   ca_dn => '/DC=ch/DC=cern/CN=CERN Trusted Certification Authority',
+#                   iam   => true
 #                  }]
 #
 # == Authors
 #
 # CERN IT/GT/DMS <[email protected]>
 # CERN IT/PES/PS <[email protected]>
+# Adam Boutcher IPPP, Durham University <[email protected]>
 #
 define voms::client ($vo = $name, $servers = []  ) {
    ensure_resource('class','voms::install')
@@ -63,9 +71,15 @@
    content: "<%= s["dn"] %>\n<%= s["ca_dn"] %>\n"
    require: File[/etc/grid-security/vomsdir/<%= @vo %>]
 
+<% if s["port"] != "0" -%>
+<% if s["iam"] != true -%>
 /etc/vomses/<%= @vo %>-<%= s["server"] %>:
+<% else -%>
+/etc/vomses/<%= s["server"] %>.vomses:
+<% end -%>
    content: "\"<%= @vo %>\" \"<%= s["server"] %>\" \"<%= s["port"] %>\" \"<%= s["dn"] %>\" \"<%= @vo %>\" \"24\"\n"
    require: File[/etc/vomses]
+<% end -%>
 
 <% end -%>
 

manifests/cms.pp

@@ -12,6 +12,7 @@
 #
 # CERN IT/GT/DMS <[email protected]>
 # CERN IT/PS/PES <[email protected]>
+# Adam Boutcher IPPP, Durham University <[email protected]>
 
 class voms::cms {
   voms::client{'cms':
@@ -24,6 +25,11 @@
                     port   => '15002',
                     dn    => '/DC=ch/DC=cern/OU=computers/CN=lcg-voms.cern.ch',
                     ca_dn => '/DC=ch/DC=cern/CN=CERN Trusted Certification Authority'
+                   },
+                   {server => 'voms-cms-auth.app.cern.ch',
+                    port   => '0',
+                    dn     => '/DC=ch/DC=cern/OU=computers/CN=cms-auth.web.cern.ch',
+                    ca_dn  => '/DC=ch/DC=cern/CN=CERN Grid Certification Authority'
                    }]
  }
 }

manifests/lhcb.pp

@@ -0,0 +1,35 @@
+# Class defining the lhcb VO, as seen by the VOMS service.
+#
+# Takes care of all the required setup to enable access to the lhcb VO
+# (users and services) in a grid enabled machine.
+#
+# == Examples
+#
+# Simply enable this class:
+#   class{'voms::lhcb':}
+#
+# == Authors
+#
+# CERN IT/GT/DMS <[email protected]>
+# CERN IT/PS/PES <[email protected]>
+# Adam Boutcher IPPP, Durham University <[email protected]>
+
+class voms::lhcb {
+  voms::client{'lhcb':
+      servers  => [{server => 'voms2.cern.ch',
+                    port   => '15003',
+                    dn     => '/DC=ch/DC=cern/OU=computers/CN=voms2.cern.ch',
+                    ca_dn  => '/DC=ch/DC=cern/CN=CERN Grid Certification Authority'
+                   },
+                   {server => 'lcg-voms2.cern.ch',
+                    port   => '15003',
+                    dn     => '/DC=ch/DC=cern/OU=computers/CN=lcg-voms2.cern.ch',
+                    ca_dn  => '/DC=ch/DC=cern/CN=CERN Grid Certification Authority'
+                   },
+                   {server => 'voms-lhcb-auth.app.cern.ch',
+                    port   => '0',
+                    dn     => '/DC=ch/DC=cern/OU=computers/CN=lhcb-auth.web.cern.ch',
+                    ca_dn  => '/DC=ch/DC=cern/CN=CERN Grid Certification Authority'
+                   }]
+ }
+}