Author: tmckay
Date: 2013-03-19 13:12:17 +0000 (Tue, 19 Mar 2013)
New Revision: 5745
Modified:
trunk/cumin/etc/cumin.conf
Log:
Fix comment and change wallaby params to wallaroo params
Modified: trunk/cumin/etc/cumin.conf
===================================================================
--- trunk/cumin/etc/cumin.conf 2013-03-18 18:06:20 UTC (rev 5744)
+++ trunk/cumin/etc/cumin.conf 2013-03-19 13:12:17 UTC (rev 5745)
@@ -13,8 +13,8 @@
[common]
# database: dbname=cumin
-# wallaby-broker:
http://localhost
-# wallaby-refresh: 60
+# wallaroo-host: localhost
+# wallaroo-refresh: 60
# log-level: info
# log-max-mb: 10
# log-max-archives: 1
@@ -180,30 +180,15 @@
## [common]
-## sasl-mech-list:
-## A space separated list that restricts the SASL mechanisms
-## Cumin may use when authenticating to the broker. By default
-## Cumin will use ANONYMOUS authentication if the broker URL does
-## not contain user/password and will use PLAIN or DIGEST-MD5
-## if the broker URL does contain user/password. DIGEST-MD5 is
-## considered more secure than PLAIN by SASL and will be
-## used if is available. This value may be set explicitly
-## to make other choices.
-## Setting the value to 'AVAILABLE' will allow Cumin to use
-## any available mechanism including ANONYMOUS.
+## wallaroo-host: localhost
+## The name of the host where the wallaroo agent is running.
+## The wallaroo agent provides inventory and configuration data
+## that appears on the inventory tab and configuration tab.
-## wallaby-broker: [first item in 'brokers' list]
-## The broker to use for interaction with a Wallaby agent.
-## This is not necessarily the same broker used for grid
-## information. The default value is the
-## first item in the 'brokers' list if not specified. To
-## turn off interaction with Wallaby, set wallaby-broker to
-## the string 'None'.
+## wallaroo-refresh: 60
+## How often in seconds to contact the wallaroo agent
+## to check for new activations
-## wallaby-refresh: 60
-## How often in seconds to contact the Wallaby agent
-## for updated information.
-
## aviary-job-servers:
http://localhost:9090
## Specifies the URIs for aviary job servers. The value
## is a comma separated list of URIs. A full URI has the
@@ -223,6 +208,12 @@
## path defaults to /services/query/. Other
## defaults are as noted for aviary-job-servers.
+## aviary-collector-servers:
http://localhost:9000
+## Like aviary-job-servers but specifies URIs for aviary
+## collector servers. The port value defaults to 9000 and
+## the path defaults to /services/collector. Other
+## defaults are as noted for aviary-job-servers.
+
## aviary-locator:
http://localhost:9000
## Specifies the URI for the aviary locator. This is
## a single value, not a list of URIs. The form of