Author: tmckay Date: 2013-07-01 17:21:08 +0000 (Mon, 01 Jul 2013) New Revision: 5776
Modified: trunk/cumin/etc/cumin.conf trunk/cumin/python/cumin/config.py Log: Change defaults for aviary ports to match new aviary ports in the 30000 range
Modified: trunk/cumin/etc/cumin.conf =================================================================== --- trunk/cumin/etc/cumin.conf 2013-06-24 20:18:39 UTC (rev 5775) +++ trunk/cumin/etc/cumin.conf 2013-07-01 17:21:08 UTC (rev 5776) @@ -27,24 +27,24 @@ # The value for this parameter is a comma separated list of URLs for Aviary # job servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-job-servers: http://localhost:9090 +# aviary-job-servers: http://localhost:39090
# The value for this parameter is a comma separated list of URLs for Aviary # query servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-query-servers: http://localhost:9091 +# aviary-query-servers: http://localhost:39091
# The value for this parameter is a comma separated list of URLs for Aviary # collector servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-collector-servers: http://localhost:9000 +# aviary-collector-servers: http://localhost:39000
# The locator allows Cumin to retrieve values for Aviary job servers and # Aviary query servers automatically. If the Aviary locator is enabled the # values for aviary-job-servers and aviary-query-servers will be overriden. # Default is empty string (aviary locator will not be used). Uncomment the # following line and edit as needed to enable. -# aviary-locator: http://localhost:9000 +# aviary-locator: http://localhost:39000
# Full path to private key file used for ssl communication with aviary servers. # This is necessary to communicate with any aviary server using the https scheme. @@ -202,12 +202,12 @@ ## How often in seconds to contact the wallaroo agent ## to check for new activations
-## aviary-job-servers: http://localhost:9090 +## aviary-job-servers: http://localhost:39090 ## Specifies the URIs for aviary job servers. The value ## is a comma separated list of URIs. A full URI has the ## form 'scheme://user/password@host:port/path". The scheme ## will default to http if not specified, the port will -## default to 9090, and the path will default to +## default to 39090, and the path will default to ## /services/job/. User and password will be empty by ## default. As a convenience, a URI that explicitly ## sets a port number may be followed by one or more @@ -215,23 +215,23 @@ ## mulitple job servers whose URIs differ only ## by port number.
-## aviary-query-servers: http://localhost:9091 +## aviary-query-servers: http://localhost:39091 ## Like aviary-job-servers but specifies URIs for aviary -## query servers. The port value defaults to 9091 and the +## query servers. The port value defaults to 39091 and the ## path defaults to /services/query/. Other ## defaults are as noted for aviary-job-servers.
-## aviary-collector-servers: http://localhost:9000 +## aviary-collector-servers: http://localhost:39000 ## Like aviary-job-servers but specifies URIs for aviary -## collector servers. The port value defaults to 9000 and +## collector servers. The port value defaults to 39000 and ## the path defaults to /services/collector. Other ## defaults are as noted for aviary-job-servers.
-## aviary-locator: http://localhost:9000 +## aviary-locator: http://localhost:39000 ## Specifies the URI for the aviary locator. This is ## a single value, not a list of URIs. The form of ## the URI is the same as that of aviary-job-servers. -## The port will default to 9000 and the path will +## The port will default to 39000 and the path will ## default to /services/locator/locate. Other defaults ## are as noted for aviary-job-servers.
Modified: trunk/cumin/python/cumin/config.py =================================================================== --- trunk/cumin/python/cumin/config.py 2013-06-24 20:18:39 UTC (rev 5775) +++ trunk/cumin/python/cumin/config.py 2013-07-01 17:21:08 UTC (rev 5776) @@ -174,10 +174,10 @@ strict_section)
param = ConfigParameter(self, "aviary-hadoop-servers", str) - param.default = "http://localhost:9090" + param.default = "http://localhost:39090"
param = ConfigParameter(self, "aviary-query-servers", str) - param.default = "http://localhost:9091" + param.default = "http://localhost:39091"
param = ConfigParameter(self, "aviary-locator", str) param.default = "" @@ -217,7 +217,7 @@ strict_section) # data uses the collector service, too param = ConfigParameter(self, "aviary-collector-servers", str) - param.default = "http://localhost:9000" + param.default = "http://localhost:39000"
class CuminWebConfigSection(BrokeredConfigSection): def __init__(self, config, name, strict_section=False): @@ -240,7 +240,7 @@
# Web uses the job server, too param = ConfigParameter(self, "aviary-job-servers", str) - param.default = "http://localhost:9090" + param.default = "http://localhost:39090"
param = ConfigParameter(self, "server-cert", str) param.default = ""
cumin-developers@lists.fedorahosted.org