From 4565773c372051fbdd0635b01356c9298415504b Mon Sep 17 00:00:00 2001 From: Justin Hiemstra Date: Tue, 17 Dec 2024 23:17:22 +0000 Subject: [PATCH] Prefer locally-defined lotman policies over federation-generated policies --- lotman/lotman_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lotman/lotman_linux.go b/lotman/lotman_linux.go index 932babcf5..93086e6f9 100644 --- a/lotman/lotman_linux.go +++ b/lotman/lotman_linux.go @@ -837,7 +837,7 @@ func initLots(nsAds []server_structs.NamespaceAdV2) ([]Lot, error) { // Handle potential need to merge discovered namespaces with provided configuration if shouldMerge { log.Debug("Merging lot configuration from discovered namespaces with configured lots") - lotMap, err = mergeLotMaps(directorLotMap, policyLotMap) + lotMap, err = mergeLotMaps(policyLotMap, directorLotMap) if err != nil { return internalLots, errors.Wrap(err, "error merging discovered namespaces with configured lots") }