synchronise with local version

files/clean-grid-env-funcs.sh

@@ -0,0 +1,13 @@
+#
+# YAIM function
+# This function unsets the variables used by grid-env-funcs.sh
+#
+unset	myvar
+unset	myvalue
+unset	myfieldsep
+unset	mytmp 
+unset -f gridpath_prepend 
+unset -f gridpath_append
+unset -f gridpath_delete
+unset -f gridenv_set
+unset -f gridenv_setind

files/grid-env-funcs.sh

@@ -0,0 +1,116 @@
+# Functions for manipulating the grid environment
+#
+# gridpath_prepend - prepend a value to a path-like environmnet variable
+#                                     - puts a ':' to the end end the beginning of the variable
+#                                     - removes the value from the string and removes duplicate '::'
+#                                     - prepend the value to the beginning of the variable
+#                                     - removes duplicate '::' and removes ':' from the beginning and the end variable
+#                                     - MANPATH has to be treated specially since, :: has a meaning -> don't get removed
+#                                     - Simple : could have a meaning so if it was there in the end or the begining we should not remove it.
+#                                     - export the variable, or echos the csh syntax
+#
+# gridpath_append - the same as prepend but it appends the value to the end of the variable
+# gridpath_delete  - delete a value from an environment variable. if the value becomes null string then it unsets the environment variable
+# gridemv_set     - sets an environment variable
+# gridemv_unset   - unsets an environment variable
+# gridenv_setind  - sets an environment variable if it is not already defined
+
+
+function gridpath_prepend() {
+		myvar="$1"
+		myvalue="$2"
+		myfieldsep=":"
+		mytmp="`eval echo \\$$myvar`" 
+
+                if [ "x$mytmp" = "x$myvalue" ] || [ "x$mytmp" = "x$myfieldsep$myvalue" ] || [ "x$mytmp" = "x$myvalue$myfieldsep" ] ; then
+                   mytmp="${mytmp//$myvalue/}"
+                else
+                  mytmp="${mytmp//$myfieldsep$myvalue$myfieldsep/$myfieldsep}" 		#remove if in the middle
+                  mytmp="${mytmp#$myvalue$myfieldsep}"					#remove if in the begining
+                  mytmp="${mytmp%$myfieldsep$myvalue}"					#remove if at the end
+                fi
+
+                if [ "x$mytmp" = "x" ]; then
+		  mytmp="$myvalue"
+                else
+		  mytmp="$myvalue$myfieldsep$mytmp"
+                fi
+
+                mytmp="${mytmp//$myfieldsep$myfieldsep$myfieldsep/$myfieldsep$myfieldsep}"
+
+                if [ "x$myvar" = "xMANPATH" ] ; then
+                  mytmp="${mytmp}::"
+                fi
+                if [ "x$ISCSHELL" = "xyes" ]; then
+                  echo "setenv $myvar \"$mytmp\"" 
+                fi
+		  eval export ${myvar}=\""$mytmp"\"
+} 
+
+function gridpath_append() {
+		myvar="$1"
+		myvalue="$2"
+		myfieldsep=":"
+                mytmp="`eval echo \\$$myvar`"
+
+                if [ "x$mytmp" = "x$myvalue" ] || [ "x$mytmp" = "x$myfieldsep$myvalue" ] || [ "x$mytmp" = "x$myvalue$myfieldsep" ] ; then
+                   mytmp="${mytmp//$myvalue/}"
+                else
+                  mytmp="${mytmp//$myfieldsep$myvalue$myfieldsep/$myfieldsep}" 		#remove if in the middle
+                  mytmp="${mytmp#$myvalue$myfieldsep}"					#remove if in the begining
+                  mytmp="${mytmp%$myfieldsep$myvalue}"					#remove if at the end
+                fi
+
+		if [ "x$mytmp" = "x" ]; then 
+                   mytmp="$myvalue"
+                else
+   		   mytmp="$mytmp$myfieldsep$myvalue"
+                fi
+
+                mytmp="${mytmp//$myfieldsep$myfieldsep$myfieldsep/$myfieldsep$myfieldsep}"
+
+                if [ "x$myvar" = "xMANPATH" ] ; then
+                  mytmp="${mytmp}::"
+                fi
+                if [ "x$ISCSHELL" = "xyes" ]; then
+                  echo "setenv $myvar \"$mytmp\"" 
+                fi
+		  eval export ${myvar}=\""$mytmp"\"
+} 
+
+function gridenv_set() {
+                myvar="$1"
+                myvalue="$2"
+                myfieldsep=":"
+
+                if [ "x$ISCSHELL" = "xyes" ]; then
+                  echo "setenv $myvar \"$myvalue\"" 
+                fi
+                  eval export ${myvar}="\"${myvalue}\""
+}
+
+function gridenv_setind() {
+               myvar="$1"
+               myvalue="$2"
+               if [ "x$ISCSHELL" = "xyes" ]; then
+	          echo 'if ( ${?'$myvar'} == 0 ) setenv '$myvar \'"$myvalue"\'
+               fi
+               eval "export $myvar=\${$myvar:-\$myvalue}"
+}
+
+function gridenv_unset() {
+          	myvar="$1"
+		eval unset \""$myvar"\"
+}
+
+function gridpath_delete() {
+                myvar="${!1}"
+		myvalue="$2"
+		declare myvar=$(echo $myvar | sed -e "s;\(^$myvalue:\|:$myvalue$\|:$myvalue\(:\)\|^$myvalue$\);\2;g")
+
+                 if [ "x$ISCSHELL" = "xyes" ]; then
+                   echo "setenv $1 \"$myvar\"" 
+                 fi
+                 eval export $1=\""$myvar"\"
+}
+

lib/puppet/parser/functions/uidfilterbygid.rb

@@ -20,7 +20,7 @@ module Puppet::Parser::Functions
       if  thisgid == gid.to_s
         filtered["uid"][key] = value
         # to be removed later once the additional defaultgid parameter works
-        filtered["gid"][key] = gid
+        # filtered["gid"][key] = gid
       end
     }
     return filtered

lib/puppet/provider/poolhome/poolhome.rb

@@ -31,11 +31,11 @@ def getUID(name)
   def getGID(name)
     poolUidGids = resource[:uidmap]
     lookup = poolUidGids["gid"][name]
-    if (lookup != "")
+    if (lookup && lookup.to_i > 0)
       gid = lookup.to_i()
     else 
-      if (resource[:defaultgid]) 
-        gid = resource[:defaultgid]
+      if (resource[:defaultgid] && resource[:defaultgid].to_i > 0 ) 
+        gid = resource[:defaultgid].to_i
       else
         gid = 0
       end

manifests/init.pp

@@ -9,6 +9,21 @@
 
   include concat::setup
 
+  file {"grid-env-funcs.sh":
+    path => '/usr/libexec/grid-env-funcs.sh',
+    source => 'puppet:///modules/vosupport/grid-env-funcs.sh',
+    owner => "root",
+    group => "root",
+    mode => 0644,
+  }
+  file {"clean-grid-env-funcs.sh":
+    path => '/usr/libexec/clean-grid-env-funcs.sh',
+    source => 'puppet:///modules/vosupport/grid-env-funcs.sh',
+    owner => "root",
+    group => "root",
+    mode => 0644,
+  }
+
   #
   # overall process: 
   #

manifests/setuphome.pp

@@ -8,7 +8,7 @@
 )
 {
   if ($prefix){
-    if ($vosupport::uidmap::vo2gidmap){
+    if ($vosupport::uidmap::vo2gidmap[$voname]){
       $gid = $vosupport::uidmap::vo2gidmap[$voname]
       poolhome {$prefix:
         ensure => present,
@@ -17,7 +17,7 @@
         digits => $digits,
         homeroot => $homeroot,
         uidmap => uidfilterbygid($vosupport::uidmap::uidmap,$gid),
-        # defaultgid => $gid,
+        defaultgid => $gid,
         require => File[$homeroot],
       }
     }

manifests/vos/atlas.pp

@@ -0,0 +1,7 @@
+  class vosupport::vos::atlas()
+  {
+   vosupport::enable_vo {
+     'atlas':
+       enable_mappings_for_service => "ARGUS"
+   }
+  }

manifests/vos/dteam.pp

@@ -0,0 +1,8 @@
+  class vosupport::vos::dteam()
+  {
+     vosupport::enable_vo {
+    'dteam':
+       enable_mappings_for_service => "ARGUS"
+   }
+
+  }