r5231 - in trunk/cumin: etc python/cumin

Author: tmckay
Date: 2012-02-29 22:07:36 +0000 (Wed, 29 Feb 2012)
New Revision: 5231

Modified:
   trunk/cumin/etc/cumin.conf
   trunk/cumin/python/cumin/config.py
Log:
Change default value for the "persona" parameter to grid.  
Change the corresponding parameter in cumin.conf that controls cumin-data 
instances.
BZ796798


Modified: trunk/cumin/etc/cumin.conf
===================================================================
--- trunk/cumin/etc/cumin.conf	2012-02-28 21:27:20 UTC (rev 5230)
+++ trunk/cumin/etc/cumin.conf	2012-02-29 22:07:36 UTC (rev 5231)
@@ -64,14 +64,14 @@
 # webs: web
 
 # Default cumin-data configuration at installation.
-# Assumes 'persona' setting in web section is 'default'
+# Assumes 'persona' setting in the web section is 'grid'
 # Expiration of samples and vacuuming of the database is handled
 # by the data.grid thread.
-datas: data.grid, data.grid-slots, data.grid-submissions, data.sesame, data.other
+datas: data.grid, data.grid-slots, data.grid-submissions, data.sesame
 
-# If the 'persona' setting in the web section is set to 'grid' then 
-# the 'data.other' section name may be omitted from 'datas' as follows.
-#datas: data.grid, data.grid-slots, data.grid-submissions, data.sesame
+# If the 'persona' setting in the web section is set to 'default' then 
+# the 'data.other' section should be added as follows.
+#datas: data.grid, data.grid-slots, data.grid-submissions, data.sesame, data.other
 
 # If the 'persona' setting in the web section is set to 'messaging' then
 # the 'data.grid*' section names may be omitted from 'datas' as follows.
@@ -94,7 +94,7 @@
 # operator-email: [none]
 # update-interval: 10
 # max-qmf-table-sort: 1000
-# persona: default
+# persona: grid
 
 #notification-timeout: 180
 # Number of seconds that a message in the yellow notification banner 
@@ -229,10 +229,10 @@
 
 # [web]
 
-# persona: default
+# persona: grid
 # Controls content of the top level page.
 # Valid values are "default", "grid", and "messaging".
-# The default persona contains content for both grid and
+# The "default" persona contains content for both grid and
 # messaging.
 
 # [data]

Modified: trunk/cumin/python/cumin/config.py
===================================================================
--- trunk/cumin/python/cumin/config.py	2012-02-28 21:27:20 UTC (rev 5230)
+++ trunk/cumin/python/cumin/config.py	2012-02-29 22:07:36 UTC (rev 5231)
@@ -50,7 +50,7 @@
         param.default = 5 * 1024 #MB
 
         param = ConfigParameter(web, "persona", str)
-        param.default = "default"
+        param.default = "grid"
         
         param = ConfigParameter(web, "fast-view-attributes", str)
         param.default =
"JobStatus,Cmd,Args,ExitStatus,JobStartDate,LastRemoteHost,LastJobStatus,Owner"