openstack: clone from the teuthology master

Do not clone from an obsolete development branch by default.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst
index 6ae7f13c960cf26dc3d5c201ae76058a078239a2..933cbb32f04421aff6f9c48568728b3767fd40a7 100644 (file)
--- 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 0aea3302ae5ac803c392ec00fec8edaa573c109a..184bf46423a744d4ca08970d950ceddcc712048f 100755 (executable)
--- 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