Merge pull request #190 from jthiltges/incommon

Add InCommon mapping to condor_mapfile

Author: brianhlin

config/condor_mapfile.osg

@@ -1,6 +1,7 @@
 GSI "^\/DC\=com\/DC\=DigiCert-Grid\/O=Open Science Grid\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
 GSI "^\/DC\=DigiCert-Grid\/DC\=com\/O=Open Science Grid\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
 GSI "^\/DC\=org\/DC\=opensciencegrid\/O=Open Science Grid\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
+GSI "^/DC=org/DC=incommon/.*/CN=([a-zA-Z0-9\.-]+)$" \1@daemon.opensciencegrid.org
 GSI "^\/C\=RU\/O\=RDIG\/OU\=hosts\/OU=*\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
 GSI "^\/C\=BR\/O\=ANSP\/OU\=ANSPGrid\ CA\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
 GSI "^\/DC\=org\/DC\=terena\/DC\=tcs.*\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org

contrib/puppet/osg_ce_condor/files/condor_mapfile

@@ -1,5 +1,10 @@
-GSI "^\/DC\=org\/DC\=doegrids\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
-GSI "^\/DC\=com\/DC\=DigiCert-Grid\/O=Open Science Grid\/OU\=Services\/CN\=(host\/)?([A-Za-z0-9.\-]*)$" \2@daemon.opensciencegrid.org
+# /DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=gw.example.edu
+# /DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=host/gw.example.edu
+GSI "^/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=(host\/)?([a-zA-Z0-9\.-]+)$" \2@daemon.opensciencegrid.org
+#
+# /DC=org/DC=incommon/C=US/postalCode=11235/ST=AA/L=City/street=Street/O=University of Example/OU=Computing Center/CN=gw.example.edu
+GSI "^/DC=org/DC=incommon/.*/CN=([a-zA-Z0-9\.-]+)$" \1@daemon.opensciencegrid.org
+#
 GSI (.*) GSS_ASSIST_GRIDMAP
 GSI (.*) anonymous@gsi
 CLAIMTOBE .* anonymous@claimtobe