Import changes from the Hosted CE container

Author: brianhlin

etc/condor-ce/config.d/50-container.conf

@@ -11,14 +11,17 @@ FRIENDLY_DAEMONS = [email protected], condor@child
 SCHEDD_CRON_GRATIA_ARGS = -f /etc/gratia/htcondor-ce/ProbeConfig
 # Increase frequency so that condor_meter doesn't take too long when
 # running drain-ce.h on container teardown
-SCHEDD_CRON_GRATIA_PERIOD = 4h
+SCHEDD_CRON_GRATIA_PERIOD = 15m
 
 # Keep the remote WN client up-to-date
-SCHEDD_CRON_JOBLIST = $(SCHEDD_CRON_JOBLIST) WNCLIENT
-SCHEDD_CRON_WNCLIENT_MODE = Periodic
-SCHEDD_CRON_WNCLIENT_PERIOD = 12h
-SCHEDD_CRON_WNCLIENT_EXECUTABLE = /usr/local/bin/remote-wn-client-wrapper.sh
-SCHEDD_CRON_WNCLIENT_PREFIX = WNCLIENT
+if ! defined SKIP_WNCLIENT
+  SCHEDD_CRON_JOBLIST = $(SCHEDD_CRON_JOBLIST) WNCLIENT
+  SCHEDD_CRON_WNCLIENT_MODE = Periodic
+  SCHEDD_CRON_WNCLIENT_PERIOD = 12h
+  SCHEDD_CRON_WNCLIENT_EXECUTABLE = /usr/bin/update-all-remote-wn-clients
+  SCHEDD_CRON_WNCLIENT_ARGS = --log-dir /var/log/condor-ce/
+  SCHEDD_CRON_WNCLIENT_PREFIX = WNCLIENT
+endif
 
 # Bump debug levels; store additional rollovers for commonly used logs
 # for troubleshooting