]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
add a key for ceph-deploy-branch detection
authorAlfredo Deza <alfredo@deza.pe>
Tue, 6 Aug 2013 22:17:51 +0000 (15:17 -0700)
committerAlfredo Deza <alfredo@deza.pe>
Tue, 6 Aug 2013 22:20:56 +0000 (15:20 -0700)
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
teuthology/task/ceph-deploy.py

index d1c51ea60f22e6695e4d6171efe47790bf957bbc..7596e490baa5c4396ce6eafe3ec5ab98c27456cd 100644 (file)
@@ -17,11 +17,11 @@ def download_ceph_deploy(ctx, config):
     log.info('Downloading ceph-deploy...')
     testdir = teuthology.get_testdir(ctx)
     ceph_admin = teuthology.get_first_mon(ctx, config)
+    ceph_deploy_branch = ctx.get('ceph-deploy', {}).get('ceph-deploy-branch', 'master')
 
     ctx.cluster.only(ceph_admin).run(
         args=[
-            'git', 'clone',
-#            'http://github.com/ceph/ceph-deploy.git',
+            'git', 'clone', '-b', ceph_deploy_branch,
             'git://ceph.com/ceph-deploy.git',
             '{tdir}/ceph-deploy'.format(tdir=testdir),
             ],