Add settings for conserver

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst
index 5706150b107fcb661b16a5ff291a92a659285e1c..f3886ba781305ca6db686f40d6ea57fd8d0f4d22 100644 (file)
--- a/docs/siteconfig.rst
+++ b/docs/siteconfig.rst
@@ -220,3 +220,7 @@ Here is a sample configuration with many of the options set and documented::
 
     # The host running a [PCP](http://pcp.io/) manager
     pcp_host: http://pcp.front.sepia.ceph.com:44323/
+
+    # Settings for http://www.conserver.com/
+    conserver_master: conserver.front.sepia.ceph.com
+    conserver_port: 3109

diff --git a/teuthology/config.py b/teuthology/config.py
index acd450d945065d86e7867321c8937028d4667abe..cb9304b8899a5f47ab5e69b4d33100df38a84b6b 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -137,6 +137,8 @@ class TeuthologyConfig(YamlConfig):
         'ceph_git_base_url': 'https://github.com/ceph/',
         'ceph_git_url': None,
         'ceph_qa_suite_git_url': None,
+        'conserver_master': 'conserver.front.sepia.ceph.com',
+        'conserver_port': 3109,
         'gitbuilder_host': 'gitbuilder.ceph.com',
         'githelper_base_url': 'http://git.ceph.com:8080',
         'check_package_signatures': True,