Merge pull request #11 from edquist/SOFTWARE-4564.scitokens

Add scitokens issuer mappings & users (SOFTWARE-4564)

Author: brianhlin

base/etc/osg/image-config.d/ce-common-startup

@@ -1,6 +1,13 @@
+# FIXME: remove mkdir once htcondor-ce 5.1.0 is released
+mkdir -p /etc/condor-ce/mapfiles.d/
+
 # Return list of local users mapped from grid credentials
 function get_mapped_users () {
-    cat /etc/grid-security/grid-mapfile /etc/grid-security/voms-mapfile |
-        awk '/^"[^"]+" +[a-zA-Z0-9\-\._]+$/ {print $NF}' |
-        sort -u
+    {
+        awk '$1 == "SCITOKENS" { print $NF }' /etc/condor-ce/condor_mapfile \
+            /etc/condor-ce/mapfiles.d/* 2>/dev/null
+        cat /etc/grid-security/grid-mapfile /etc/grid-security/voms-mapfile |
+            awk '/^"[^"]+" +[a-zA-Z0-9\-\._]+$/ {print $NF}'
+    } | sort -u
 }
+