Merge branch '2024.5.1-rc4'

lsst · May 16, 2024 · 671a955 · 671a955
2 parents 116e45d + e634c97
commit 671a955
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/configmap/cmsd-server/start/start.sh b/configmap/cmsd-server/start/start.sh
@@ -11,7 +11,6 @@ entrypoint --log-level DEBUG worker-cmsd \
           --db-uri {{.SocketQservUser}} \
           --vnid-config "@/usr/local/lib64/libreplica.so {{.WorkerDatabaseLocalURL}} 0 0" \
           --cmsd-manager-name {{.XrootdRedirectorDN}} \
-          --cmsd-manager-count {{.XrootdRedirectorReplicas}} \
           --log-cfg-file "/cm-etc/log.cnf" \
           --instance-id="{{.QservInstance}}" \
           --registry-host="{{.ReplicationRegistryDN}}" \

diff --git a/configmap/xrootd-redirector/start/start.sh b/configmap/xrootd-redirector/start/start.sh
@@ -8,6 +8,5 @@
 set -eux
 
 entrypoint xrootd-manager \
-          --cmsd-manager-name "{{.XrootdRedirectorDN}}" \
-          --cmsd-manager-count "{{.XrootdRedirectorReplicas}}"
+          --cmsd-manager-name "{{.XrootdRedirectorDN}}"
 
diff --git a/configmap/xrootd-server/start/start.sh b/configmap/xrootd-server/start/start.sh
@@ -18,7 +18,6 @@ entrypoint --log-level DEBUG worker-xrootd \
           --db-admin-uri "{{.SocketRootUser}}" \
           --vnid-config "@/usr/local/lib64/libreplica.so {{.WorkerDatabaseLocalURL}} 0 0" \
           --cmsd-manager-name "{{.XrootdRedirectorDN}}" \
-          --cmsd-manager-count "{{.XrootdRedirectorReplicas}}" \
           --mysql-monitor-password "CHANGEME_MONITOR" \
           --log-cfg-file "/cm-etc/log.cnf" \
           --results-protocol "{{.ResultsProtocol}}" \