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.

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

Update WMAgent deployment to parse MSPILEUP_URL - take2 #1293

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion wmagentpy3/manage
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ RUCIO_HOST=
RUCIO_AUTH=
RUCIO_ACCOUNT=

MSPILEUP_URL=

#
# Init checks
#
Expand Down Expand Up @@ -133,6 +135,7 @@ load_secrets_file(){
local MATCH_RUCIO_HOST=`cat $WMAGENT_SECRETS_LOCATION | grep RUCIO_HOST | sed s/RUCIO_HOST=//`
local MATCH_RUCIO_AUTH=`cat $WMAGENT_SECRETS_LOCATION | grep RUCIO_AUTH | sed s/RUCIO_AUTH=//`
local MATCH_RUCIO_ACCOUNT=`cat $WMAGENT_SECRETS_LOCATION | grep RUCIO_ACCOUNT | sed s/RUCIO_ACCOUNT=//`
local MATCH_MSPILEUP_URL=`cat $WMAGENT_SECRETS_LOCATION | grep MSPILEUP_URL | sed s/MSPILEUP_URL=//`

# database settings (mysql or oracle)
if [ "x$MATCH_ORACLE_USER" == "x" ]; then
Expand Down Expand Up @@ -194,6 +197,8 @@ load_secrets_file(){
RUCIO_HOST=${MATCH_RUCIO_HOST:-$RUCIO_HOST}
RUCIO_AUTH=${MATCH_RUCIO_AUTH:-$RUCIO_AUTH}
RUCIO_ACCOUNT=${MATCH_RUCIO_ACCOUNT:-$RUCIO_ACCOUNT}

MSPILEUP_URL=${MATCH_MSPILEUP_URL:-$MSPILEUP_URL}
}

print_settings(){
Expand Down Expand Up @@ -228,6 +233,7 @@ print_settings(){
echo "RUCIO_HOST= $RUCIO_HOST "
echo "RUCIO_AUTH= $RUCIO_AUTH "
echo "RUCIO_ACCOUNT= $RUCIO_ACCOUNT "
echo "MSPILEUP_URL= $MSPILEUP_URL "

}

Expand Down Expand Up @@ -582,7 +588,8 @@ init_wmagent(){
--amq_credentials=$AMQ_CREDENTIALS \
--rucio_account=$RUCIO_ACCOUNT \
--rucio_host=$RUCIO_HOST \
--rucio_auth=$RUCIO_AUTH
--rucio_auth=$RUCIO_AUTH \
--mspileup_url=$MSPILEUP_URL

wmcore-db-init --config $CONFIG_AG/config.py --create --modules=WMCore.WMBS,WMCore.Agent.Database,WMComponent.DBS3Buffer,WMCore.BossAir,WMCore.ResourceControl;

Expand Down