Set memory and CPU via environment variables

0212.node_worker_bwforcluster_nemo2.cfg

@@ -10,8 +10,8 @@ STARTD.CloudSite = "BwForCluster-Nemo2"
 
 # Machine/Job environment
 # Use TardisDroneUuid to identify drones in OBS
-# TardisDroneUuid = "$ENV(TardisDroneUuid)"
-# STARTD_NAME = $ENV(TardisDroneUuid)
+TardisDroneUuid = "$ENV(TardisDroneUuid)"
+STARTD_NAME = "$ENV(TardisDroneUuid)"
 
 # Matchmaking advertisement
 STARTD.ProvidesIO    = TRUE
@@ -65,11 +65,19 @@ MASTER.DAEMON_SHUTDOWN = ( TimeToLive <= 10 * $(MINUTE) )
 MASTER.DAEMON_SHUTDOWN_FAST = ( TimeToLive <= 3 * $(MINUTE) )
 
 # Set number of CPUs
-NUM_CPUS = 32
-MEMORY = 128000
-
-TardisDroneUuid = "$ENV(TardisDroneUuid)"
-STARTD_NAME = $ENV(TardisDroneUuid)
+CPUsDefault = 8
+NUM_CPUS =  \
+    ifThenElse( isUndefined($ENV(SLURM_CPUS_ON_NODE)), \
+        $(CPUsDefault), \
+        $ENV(SLURM_CPUS_ON_NODE) \
+    )
+# Set memory
+MemoryDefault = 20480
+MEMORY = \
+    ifThenElse( isUndefined($ENV(SLURM_MEM_PER_NODE)), \
+        $(CPUsDefault), \
+        $ENV(SLURM_MEM_PER_NODE) \
+    )
 
 # The maximum number of claims during one negotiation cycle.
 # This is a tradeoff between allowing the cluster to fill fast (high value),