From: Loic Dachary Date: Mon, 14 Sep 2015 12:20:57 +0000 (+0200) Subject: openstack: clone from the teuthology master X-Git-Tag: 1.1.0~822^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F625%2Fhead;p=teuthology.git openstack: clone from the teuthology master Do not clone from an obsolete development branch by default. Signed-off-by: Loic Dachary --- diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst index 6ae7f13c9..933cbb32f 100644 --- a/docs/siteconfig.rst +++ b/docs/siteconfig.rst @@ -118,7 +118,7 @@ Here is a sample configuration with many of the options set and documented:: # this command for the purpose of deploying teuthology from # scratch and run workers listening on the openstack tube # - clone: git clone -b wip-6502-openstack-v3 http://github.com/dachary/teuthology + clone: git clone http://github.com/ceph/teuthology # The path to the user-data file used when creating a target. It can have # the {os_type} and {os_version} placeholders which are replaced with diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh index 0aea3302a..184bf4642 100755 --- a/teuthology/openstack/setup-openstack.sh +++ b/teuthology/openstack/setup-openstack.sh @@ -59,7 +59,7 @@ lab_domain: $labdomain max_job_time: 14400 # 4 hours teuthology_path: . openstack: - clone: git clone -b wip-6502-openstack-v3 http://github.com/dachary/teuthology + clone: git clone http://github.com/ceph/teuthology user-data: teuthology/openstack/openstack-{os_type}-{os_version}-user-data.txt ip: $ip nameserver: $nameserver