From: Zack Cerza Date: Tue, 23 Aug 2016 16:08:57 +0000 (-0600) Subject: Add settings for conserver X-Git-Tag: 1.1.0~537^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16273b3370dbd5d1995ec0e85d05e4ccaa57b5c9;p=teuthology.git Add settings for conserver Signed-off-by: Zack Cerza --- diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst index 5706150b1..f3886ba78 100644 --- 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 acd450d94..cb9304b88 100644 --- 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,