nemo updates

0212.node_worker_bwforcluster_container.cfg

 # bwForCluster OpenStack Worker Setup
 # -----------------------------------
 # Cloud attributes
-STARTD.CloudSite = "BWFORCLUSTER_CONTAINER"
+STARTD.CloudSite = "BwForClusterNemo"
 
 # STARTD_DEBUG = D_ANY
 # START_DEBUG = D_ANY
@@ -44,7 +44,7 @@ TCP_KEEPALIVE_INTERVAL = 4 * $(MINUTE)
 WalltimeDefault = 86400
 
 # Read/set MachineMaxWalltime & MachineStarttime (set by cloud-init)
-include command into $(ETC)/walltime.cfg : python3 $(ETC)/meta_walltime_moab.py
+include command into $(ETC)/walltime.cfg : python3 $(ETC)/meta_walltime_generic.py
 MachineWalltime = $(MachineMaxWalltime:$(WalltimeDefault))
 MaxShutdownTime = $(MachineStarttime) + $(MachineWalltime)
 STARTD.MaxJobRetirementTime = $(MaxShutdownTime) - $(JobStart:0) - 3 * $(MINUTE)

0212.node_worker_bwforcluster_nemo2.cfg

 # bwForCluster OpenStack Worker Setup
 # -----------------------------------
 # Cloud attributes
-STARTD.CloudSite = "BWFORCLUSTER_NEMO2"
+STARTD.CloudSite = "BwForCluster-Nemo2"
 
 # STARTD_DEBUG = D_ANY
 # START_DEBUG = D_ANY
@@ -21,7 +21,7 @@ STARTD.ProvidesCpu   = TRUE
 SEC_DEFAULT_AUTHENTICATION_METHODS = PASSWORD, IDTOKENS, SCITOKENS
 SEC_TOKEN_DIRECTORY = $(ETC)/tokens.d/
 SEC_TOKEN_SYSTEM_DIRECTORY = $(ETC)/tokens.d/
-DomainNemo = login2.nemo.privat
+DomainNemo = nemo.privat
 ALLOW_DEAMON = $(ALLOW_DEAMON), condor@$(DomainNemo), condor_pool@$(DomainNemo)
 ALLOW_WRITE = $(ALLOW_WRITE), condor@$(DomainNemo), condor_pool@$(DomainNemo)
 ALLOW_ADMINISTRATOR  = $(ALLOW_ADMINISTRATOR), \
@@ -44,7 +44,7 @@ TCP_KEEPALIVE_INTERVAL = 4 * $(MINUTE)
 WalltimeDefault = 86400
 
 # Read/set MachineMaxWalltime & MachineStarttime (set by cloud-init)
-include command into $(ETC)/walltime.cfg : python3 $(ETC)/meta_walltime_moab.py
+include command into $(ETC)/walltime.cfg : python3 $(ETC)/meta_walltime_generic.py
 MachineWalltime = $(MachineMaxWalltime:$(WalltimeDefault))
 MaxShutdownTime = $(MachineStarttime) + $(MachineWalltime)
 STARTD.MaxJobRetirementTime = $(MaxShutdownTime) - $(JobStart:0) - 3 * $(MINUTE)

scripts/config_sites.json

@@ -22,7 +22,7 @@
             },
             {
                 "destination": "/etc/condor/",
-                "name": "meta_walltime_moab.py"
+                "name": "meta_walltime_generic.py"
             },
             {
                 "destination": "/etc/condor/",
@@ -65,7 +65,7 @@
             },
             {
                 "destination": "/etc/condor/",
-                "name": "meta_walltime_moab.py"
+                "name": "meta_walltime_generic.py"
             },
             {
                 "destination": "/etc/condor/",