Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If POOL is a hostname or host:port then use it as a central manager as opposed to bailing out #156

Merged
merged 1 commit into from
Nov 22, 2023
Merged

If POOL is a hostname or host:port then use it as a central manager as opposed to bailing out #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions 10-setup-htcondor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,17 @@ fi

# Default to the production OSPool unless $ITB is set
if is_true "$ITB"; then
POOL=${POOL:=itb-ospool}
if [[ $POOL == ospool ]]; then
POOL=itb-ospool
fi
glidein_group=itb
glidein_group_dir=client_group_itb
script_exec_prefix=/usr/sbin/itb-
script_lib_prefix=/gwms/client_group_itb/itb-
else
POOL=${POOL:=prod-ospool}
if [[ $POOL == ospool ]]; then
POOL=prod-ospool
fi
glidein_group=main
glidein_group_dir=client_group_main
script_exec_prefix=/usr/sbin/
Expand Down Expand Up @@ -206,6 +210,15 @@ case ${POOL} in
default_syslog_host=syslog.osgdev.chtc.io
GLIDECLIENT_Group=path-container
;;
*.*)
ENABLE_REMOTE_SYSLOG=false
default_cm1=$POOL
default_cm2=
;;
'')
echo "POOL is blank" >&2
exit 1
;;
*)
echo "Unknown pool $POOL" >&2
exit 1
Expand Down Expand Up @@ -327,7 +340,10 @@ if [[ -n $CONDOR_HOST ]]; then
# so we unset it here to avoid confusion
POOL=
else
CONDOR_HOST=$default_cm1,$default_cm2
CONDOR_HOST=$default_cm1
if [[ $default_cm2 ]]; then
CONDOR_HOST=${CONDOR_HOST},${default_cm2}
fi
fi

# default COLLECTOR_HOST
Expand Down Expand Up @@ -420,7 +436,7 @@ EXECUTE = $LOCAL_DIR/execute
SEC_TOKEN_DIRECTORY = $LOCAL_DIR/condor/tokens.d

COLLECTOR_HOST = $COLLECTOR_HOST
CCB_ADDRESS = $CCB_ADDRESS
${CCB_ADDRESS:+"CCB_ADDRESS = $CCB_ADDRESS"}

# Let the OS pick a random shared port port so we don't collide with anything else
SHARED_PORT_PORT = 0
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,7 @@ ENV ENABLE_REMOTE_SYSLOG=true
# Use ITB versions of scripts and connect to the ITB pool
ENV ITB=false

# The pool to join; this can be 'itb-ospool', 'prod-ospool', 'prod-path-facility',
# 'dev-path-facility', or the hostname or host:port of a central manager.
# If it's set to 'ospool', then it will use 'itb-ospool' or 'prod-ospool' depending on $ITB.
ENV POOL=ospool