spacemanager: Add missing properties and fix system-test config

Target: trunk Require-book: no Require-notes: no Acked-by: Paul Millar <paul.millar@desy.de> Patch: http://rb.dcache.org/r/5821/
dCache · Jul 31, 2013 · 4d22de6 · 4d22de6
1 parent 2674fe1
commit 4d22de6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/system-test/src/main/skel/etc/layouts/system-test.conf b/packages/system-test/src/main/skel/etc/layouts/system-test.conf
@@ -76,7 +76,7 @@ pool.path=${dcache.home}/var/pools/pool_r3
 pool.lfs=precious
 
 [dCacheDomain/spacemanager]
-SpaceManagerLinkGroupAuthorizationFileName=${dcache.paths.etc}/linkgroup.conf
+spacemanager.authz.link-group-file-name=${dcache.paths.etc}/linkgroup.conf
 
 [dCacheDomain/pinmanager]
 [dCacheDomain/cleaner]

diff --git a/skel/share/defaults/spacemanager.properties b/skel/share/defaults/spacemanager.properties
@@ -60,6 +60,11 @@ spacemanager.authz.link-group-file-name=${SpaceManagerLinkGroupAuthorizationFile
 
 (one-of?true|false|${dcache.enable.spacemanager})spacemanager.enable.spacemanager=${dcache.enable.spacemanager}
 
+
+# Cell communication related properties
+spacemanager.service.poolmanager=${dcache.service.poolmanager}
+spacemanager.service.pnfsmanager=${dcache.service.pnfsmanager}
+
 #
 # Database related settings reserved for internal use.
 #