HTCONDOR-3279 config cleanup

config/01-ce-router-defaults.conf

@@ -9,8 +9,8 @@
 #
 ###############################################################################
 
-# The below script generates proper settings for JOB_ROUTER_DEFAULTS, merged
-# with OSG environment variables (if present).  Anytime you reconfig the OSG,
+# The below script generates default route transforms based on
+# OSG environment variables (if present).  Anytime you reconfig the OSG,
 # you will need to reconfig HTCondor-CE
 LOCAL_CONFIG_FILE = /usr/share/condor-ce/condor_ce_router_defaults|
 
@@ -100,28 +100,6 @@ HTCondorCEVersion = "@HTCONDORCE_VERSION@"
 grid_resource = strcat("condor ", ifThenElse(size("$(SCHEDD_NAME)") > 0, "$(SCHEDD_NAME)", "$(FULL_HOSTNAME)"), " ", "$(COLLECTOR_HOST)")
 SCHEDD_ATTRS = $(SCHEDD_ATTRS) HTCondorCEVersion grid_resource
 
-# Use the defaults generated by the condor_ce_router_defaults script.  To add
-# additional defaults in the old syntax, add additional lines of the form:
-#
-#   JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;]
-#
-MERGE_JOB_ROUTER_DEFAULT_ADS=True
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED)
-
-# Disable JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default.
-# These represent the old route syntax, which will be removed for
-# HTCondor V24.
-JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False
-
-
 #################################
 # Default Job Router Transforms #
 #################################

config/01-ce-router.conf

@@ -32,26 +32,3 @@ ROUTED_JOB_MAX_TIME = 4320
 # remain in the queue after completion.
 # (default: 30)
 # COMPELTED_JOB_EXPIRATION = 30
-
-
-# Use the defaults generated by the condor_ce_router_defaults script.  To add
-# additional defaults, add additional lines of the form:
-#
-#   JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;]
-#
-MERGE_JOB_ROUTER_DEFAULT_ADS=True
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED)
-
-
-# Set whether to enable the old Job Router route syntax, defaults to False
-# (i.e. JOB_ROUTER_DEFAULTS combined with JOB_ROUTER_ENTRIES).
-#
-# JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True

config/01-common-auth-defaults.conf

@@ -12,9 +12,6 @@
 # Authentication settings
 use security:recommended
 
-# Pool password directory for the CE and collector.
-SEC_PASSWORD_DIRECTORY = /etc/condor-ce/passwords.d
-
 # Authentication settings
 CERTIFICATE_MAPFILE=/etc/condor-ce/condor_mapfile
 
@@ -34,6 +31,3 @@ COLLECTOR_BOOTSTRAP_SSL_CERTIFICATE = false
 # N.B. authN negotation here is ultimately decided by the client so this
 # configuration only applies to usage of 'condor_ce_q'
 TOOL.CONDOR_Q_ONLY_MY_JOBS = false
-
-# Override the token directory
-SEC_TOKEN_SYSTEM_DIRECTORY = /etc/condor-ce/tokens.d

config/02-ce-bosco.conf

@@ -14,24 +14,3 @@ JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt
 @jrt
 
 JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES = \
-#    [ \
-#      GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \
-#      TargetUniverse = 9; \
-#      name = "Local_BOSCO"; \
-#    ]
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_BOSCO

config/02-ce-condor.conf

@@ -27,24 +27,3 @@ JOB_ROUTER_ROUTE_NAMES = Condor_Pool
 JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool
 JOB_ROUTER_SCHEDD2_NAME=$(FULL_HOSTNAME)
 JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES @=jre
-# [
-#   TargetUniverse = 5;
-#   name = "Local_Condor";
-# ]
-# @jre
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_Condor

config/02-ce-lsf.conf

@@ -13,25 +13,3 @@ JOB_ROUTER_ROUTE_LSF_Cluster @=jrt
 @jrt
 
 JOB_ROUTER_ROUTE_NAMES = LSF_Cluster
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES @=jre
-# [
-#   GridResource = "batch lsf";
-#   TargetUniverse = 9;
-#   name = "Local_LSF";
-# ]
-# @jre
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_LSF

config/02-ce-pbs.conf

@@ -13,25 +13,3 @@ JOB_ROUTER_ROUTE_PBS_Cluster @=jrt
 @jrt
 
 JOB_ROUTER_ROUTE_NAMES = PBS_Cluster
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES @=jre
-# [
-#   GridResource = "batch pbs";
-#   TargetUniverse = 9;
-#   name = "Local_PBS";
-# ]
-# @jre
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_PBS

config/02-ce-sge.conf

@@ -13,25 +13,3 @@ JOB_ROUTER_ROUTE_SGE_Cluster @=jrt
 @jrt
 
 JOB_ROUTER_ROUTE_NAMES = SGE_Cluster
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES @=jre
-# [
-#   GridResource = "batch sge";
-#   TargetUniverse = 9;
-#   name = "Local_SGE";
-# ]
-# @jre
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_SGE

config/02-ce-slurm.conf

@@ -13,25 +13,3 @@ JOB_ROUTER_ROUTE_Slurm_Cluster @=jrt
 @jrt
 
 JOB_ROUTER_ROUTE_NAMES = Slurm_Cluster
-
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Old-style job route configuration. To use this instead of
-# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
-# in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
-#
-# JOB_ROUTER_ENTRIES @=jre
-# [
-#   GridResource = "batch slurm";
-#   TargetUniverse = 9;
-#   name = "Local_Slurm";
-# ]
-# @jre
-#
-# JOB_ROUTER_ROUTE_NAMES = Local_Slurm

config/condor_config

@@ -9,66 +9,67 @@
 # 
 ###############################################################################
 
-# Set the collector to run on an alternate port
-CONDOR_HOST = $(FULL_HOSTNAME)
-PORT = 9619
-COLLECTOR_HOST = $(CONDOR_HOST):$(PORT)
-# The above definition should be sufficient for HTCondor.
-# However, we must make sure the port definitions match.
-COLLECTOR_PORT = $(PORT)
-SHARED_PORT_PORT = $(PORT)
+##  Where have you installed the bin, sbin and lib condor directories?
+RELEASE_DIR = /usr
 
-DAEMON_LIST = MASTER COLLECTOR SCHEDD JOB_ROUTER
+##  Where is the local condor directory for each host?  This is where the local config file(s), logs and
+##  spool/execute directories are located. this is the default for Linux and Unix systems.
+LOCAL_DIR = /var
 
-RELEASE_DIR = /usr
+##  The normal way to do configuration with RPM and Debian packaging is to read all of the
+##  files in a given directory that don't match a regex as configuration files.
+##  Config files are read in lexicographic order.
+##  Multiple directories may be specified, separated by commas; directories
+##  are read in left-to-right order.
+LOCAL_CONFIG_DIR = /usr/share/condor-ce/config.d,/etc/condor-ce/config.d
+#LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
 
-SBIN = $(RELEASE_DIR)/sbin
-LIBEXEC = $(RELEASE_DIR)/libexec/condor
-MASTER       = $(SBIN)/condor_master
-SCHEDD       = $(SBIN)/condor_schedd
-GRIDMANAGER  = $(SBIN)/condor_gridmanager
-GRID_MONITOR = $(SBIN)/grid_monitor.sh
-JOB_ROUTER    = $(LIBEXEC)/condor_job_router
-COLLECTOR     = $(SBIN)/condor_collector
-SHARED_PORT = $(LIBEXEC)/condor_shared_port
+##--------------------------------------------------------------------
+## Values set for linux native packaging:
+##--------------------------------------------------------------------
 
-LOCAL_DIR = /var
+##  Pathnames
 RUN     = $(LOCAL_DIR)/run/condor-ce
 LOG     = $(LOCAL_DIR)/log/condor-ce
+LOCK    = $(LOCAL_DIR)/lock/condor-ce
 SPOOL   = $(LOCAL_DIR)/lib/condor-ce/spool
 EXECUTE = $(LOCAL_DIR)/lib/condor-ce/execute
-LOCK    = $(LOCAL_DIR)/lock/condor-ce
+ETC     = /etc/condor-ce
+BIN     = $(RELEASE_DIR)/bin
+LIB     = $(RELEASE_DIR)/lib64/condor
+INCLUDE = $(RELEASE_DIR)/include/condor
+SBIN    = $(RELEASE_DIR)/sbin
+LIBEXEC = $(RELEASE_DIR)/libexec/condor
+SHARE   = $(RELEASE_DIR)/share/condor
 
-MASTER_ADDRESS_FILE = $(LOG)/.master_address
-SCHEDD_ADDRESS_FILE = $(SPOOL)/.schedd_address
+JAVA_CLASSPATH_DEFAULT = $(SHARE) .
 
-LOCAL_CONFIG_DIR = /usr/share/condor-ce/config.d,/etc/condor-ce/config.d
-LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
+SINGULARITY = /usr/bin/singularity
 
-CONDOR_ADMIN = root@$(FULL_HOSTNAME)
-MAIL         = /bin/mail
+##--------------------------------------------------------------------
+## Values specific to the HTCondor-CE:
+##--------------------------------------------------------------------
+
+# Set the collector to run on an alternate port
+CONDOR_HOST = $(FULL_HOSTNAME)
+PORT = 9619
+COLLECTOR_HOST = $(CONDOR_HOST):$(PORT)
+# The above definition should be sufficient for HTCondor.
+# However, we must make sure the port definitions match.
+COLLECTOR_PORT = $(PORT)
+SHARED_PORT_PORT = $(PORT)
+
+DAEMON_LIST = MASTER COLLECTOR SCHEDD JOB_ROUTER
 
 EMAIL_DOMAIN = $(FULL_HOSTNAME)
 
-# Basic GAHP configurations
-GRIDMANAGER_LOG = $(LOG)/GridmanagerLog.$(USERNAME)
-GRIDMANAGER_LOCK = $(LOCK)/GridmanagerLock.$(USERNAME)
+# Move GAHP files out of /tmp
 USER_LOG = $(LOG)/user
 USER_LOCK = $(LOCK)/user
-VM_GAHP_LOG = $(LOG)/VMGahpLog
-AMAZON_GAHP_LOG = $(USER_LOG)/user/AmazonGahpLog.$(USERNAME)
-C_GAHP_LOCK = /CGAHPLock.$(USERNAME)
-C_GAHP_LOG = /tmp/CGAHPLog.$(USERNAME)
+C_GAHP_LOCK = $(USER_LOCK)/CGAHPLock.$(USERNAME)
+C_GAHP_LOG = $(USER_LOG)/CGAHPLog.$(USERNAME)
 C_GAHP_WORKER_THREAD_LOCK = $(USER_LOCK)/CGAHPWorkerLock.$(USERNAME)
 C_GAHP_WORKER_THREAD_LOG = $(USER_LOG)/CGAHPWorkerLog.$(USERNAME)
-CONDOR_GAHP = $(SBIN)/condor_c-gahp
-CONDOR_GAHP_WORKER = $(SBIN)/condor_c-gahp_worker_thread
-AMAZON_GAHP = $(SBIN)/amazon_gahp
-CREAM_GAHP = $(SBIN)/cream_gahp
-GT2_GAHP = $(SBIN)/gahp_server
-NORDUGRID_GAHP = $(SBIN)/nordugrid_gahp
-UNICORE_GAHP = $(SBIN)/unicore_gahp
-VM_GAHP_SERVER = $(SBIN)/condor_vm-gahp
 
 # Use wrapper script to set environment in local universe jobs
 DATA_DIR = $(RELEASE_DIR)/share/condor-ce