Fix drone values from environment variables

0212.node_worker_bwforcluster_nemo2.cfg

@@ -29,7 +29,6 @@ ALLOW_ADMINISTRATOR  = $(ALLOW_ADMINISTRATOR), \
 
 
 # Network settings
-# PRIVATE_NETWORK_NAME = cloud.ruf.uni-freiburg.de
 
 DEFAULT_DOMAIN_NAME = $(DomainNemo)
 UID_DOMAIN          = $(DomainNemo)
@@ -55,6 +54,8 @@ STARTD.MaxJobRetirementTime = $(MaxShutdownTime) - $(JobStart:0) - 3 * $(MINUTE)
 TimeToLive = $(MaxShutdownTime) - time()
 
 # Auto Shutdown
+# Auto Shutdown after 7 minutes of idle time
+STARTD_NOCLAIM_SHUTDOWN = 7 * $(MINUTE)
 # Shutting down MASTER will trigger shutdown to all other daemons
 # Early "nice" shutdown 10 Minutes before limit is reached
 MASTER.DAEMON_SHUTDOWN = ( TimeToLive <= 10 * $(MINUTE) )
@@ -63,25 +64,14 @@ MASTER.DAEMON_SHUTDOWN_FAST = ( TimeToLive <= 3 * $(MINUTE) )
 
 # Set number of CPUs
 DEFAULT_NUM_CPUS = 20
-NUM_CPUS = ifThenElse( IsUndefined($ENV(SLURM_CPUS_ON_NODE)), \
-        $(DEFAULT_NUM_CPUS), \
-        $ENV(SLURM_CPUS_ON_NODE)  \
-    )
-
+NUM_CPUS = $ENV(SLURM_CPUS_ON_NODE)
 DEFAULT_Memory = 12000
-MEMORY = ifThenElse( IsUndefined($ENV(SLURM_MEM_ON_NODE)), \
-        $(DEFAULT_Memory), \
-        $ENV(SLURM_MEM_ON_NODE)  \
-    )
+MEMORY = $ENV(SLURM_MEM_ON_NODE)
 
 TardisDroneUuid = "$ENV(TardisDroneUuid)"
 STARTD_NAME = $ENV(TardisDroneUuid)
 
 
-# Machine/Job environment
-# Read /etc/environment, for example for http proxy
-STARTD.JOB_INHERITS_STARTER_ENVIRONMENT = TRUE
-include command into $(ETC)/environment.cfg : $(ETC)/get_machine_env.sh
 
 # Inverse wall-time job ranking
 # - prefer long running jobs (shorter jobs can back-fill)