Archipelago: Adjust new conffile

[archipelago] / xseg / conf / archipelago.conf

diff --git a/xseg/conf/archipelago.conf b/xseg/conf/archipelago.conf
index 0056053..82c2848 100644 (file)
--- a/xseg/conf/archipelago.conf
+++ b/xseg/conf/archipelago.conf
@@ -1,12 +1,11 @@
 # xseg
 # xseg

-
+[XSEG]

 # Max xseg ports supported by segment
 SEGMENT_PORTS = 2048
 SEGMENT_DYNPORTS = 1024
 
 # Max segment size
 # Max xseg ports supported by segment
 SEGMENT_PORTS = 2048
 SEGMENT_DYNPORTS = 1024
 
 # Max segment size

-SEGMENT_SIZE = 5120
-
+SEGMENT_SIZE = 2048

 # Start port of xsegbd devices
 XSEGBD_START=0
 # End port of xsegbd devices
 # Start port of xsegbd devices
 XSEGBD_START=0
 # End port of xsegbd devices

@@ -17,6 +16,13 @@ VTOOL_START=1003
 # End of port range that can be used by the vlmc tool
 VTOOL_END=1022
 
 # End of port range that can be used by the vlmc tool
 VTOOL_END=1022
 

+[PEERS]
+ROLES=blockerb blockerm mapperd vlmcd
+# Order matters. Peers will be started with list order and stopped with reversed
+# order.
+ORDER=blockerb blockerm mapperd vlmcd
+
+

 # (peer role, peer type)
 # Mandatory peer roles:
 #      blockerb
 # (peer role, peer type)
 # Mandatory peer roles:
 #      blockerb

@@ -30,13 +36,6 @@ VTOOL_END=1022
 #      mapperd
 #      vlmcd
 #
 #      mapperd
 #      vlmcd
 #

-# Order matters. Peers will be started with list order and stopped with reversed
-# order.
-
-roles = [('blockerb', 'file_blocker'),
-         ('blockerm', 'file_blocker'),
-         ('mapperd', 'mapperd'),
-         ('vlmcd', 'vlmcd')]

 
 # Generic peer options
 # portno_start: Start of port range that will be used by the peer
 
 # Generic peer options
 # portno_start: Start of port range that will be used by the peer

@@ -64,54 +63,52 @@ roles = [('blockerb', 'file_blocker'),
 #
 # pool: rados pool where objects will reside
 
 #
 # pool: rados pool where objects will reside
 

-blockerb= {
-    'portno_start': 1000,
-    'portno_end': 1000,
-    'log_level': 3,
-    'nr_ops': 64,
-    'nr_threads': 64,
-    'archip_dir': '/srv/archip/blocks',
-    'fdcache': 512,
-    'direct': True,
-}
-
-blockerm = {
-    'portno_start': 1002,
-    'portno_end': 1002,
-    'log_level': 3,
-    'nr_ops': 64,
-    'nr_threads': 64,
-    'archip_dir': '/srv/archip/maps',
-    'fdcache': 512,
-    'direct': True,
-}
+[blockerb]
+type=file_blocker
+portno_start=1000
+portno_end=1000
+log_level=3
+nr_ops=64
+nr_threads=64
+archip_dir=/srv/archip/blocks
+fdcache=512
+direct=True
+
+[blockerm]
+type=file_blocker
+portno_start=1002
+portno_end=1002
+log_level=3
+nr_ops=64
+nr_threads=64
+archip_dir=/srv/archip/maps
+fdcache=512
+direct=True

 
 # mapperd specific options:
 #
 # blockerb_port: target port that will be used to communicate with the blockerb
 # blockerm_port: target port that will be used to communicate with the blockerm
 
 
 # mapperd specific options:
 #
 # blockerb_port: target port that will be used to communicate with the blockerb
 # blockerm_port: target port that will be used to communicate with the blockerm
 

-mapperd = {
-    'portno_start': 1001,
-    'portno_end': 1001,
-    'log_level': 3,
-    'nr_ops': 512,
-    'blockerb_port': 1000,
-    'blockerm_port': 1002
-}
+[mapperd]
+type=mapperd
+portno_start=1001
+portno_end=1001
+log_level=3
+nr_ops=512
+blockerb_port=1000
+blockerm_port=1002

 
 # vlmcd specific options:
 #
 # blocker_port: target port that will be used to communicate with the blockerb
 # mapper_port: target port that will be used to communicate with the mapper
 
 
 # vlmcd specific options:
 #
 # blocker_port: target port that will be used to communicate with the blockerb
 # mapper_port: target port that will be used to communicate with the mapper
 

-vlmcd = {
-    'portno_start': 500,
-    'portno_end': 999,
-    'log_level': 3,
-    'nr_ops': 512,
-    'blocker_port': 1000,
-    'mapper_port': 1001
-}
-
-
+[vlmcd]
+type=vlmcd
+portno_start=500
+portno_end=999
+log_level=3
+nr_ops=512
+blocker_port=1000
+mapper_port=1001