]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
use dev option instead of dev-commit
authorVasu Kulkarni <vasu@redhat.com>
Thu, 15 Dec 2016 22:11:00 +0000 (14:11 -0800)
committerVasu Kulkarni <vasu@redhat.com>
Mon, 30 Jan 2017 22:10:24 +0000 (14:10 -0800)
Fixes: http://tracker.ceph.com/issues/18736
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
qa/tasks/ceph_deploy.py

index 404f8d61b783db74647d9db02319e8c8374b9f22..382120f4de75d9cbfe571dd2532c46e3d1399adc 100644 (file)
@@ -239,12 +239,12 @@ def build_ceph_cluster(ctx, config):
                         ceph_admin, conf_path, lines, sudo=True)
 
         # install ceph
-        ceph_sha = ctx.config['sha1']
-        devcommit = '--dev-commit={sha}'.format(sha=ceph_sha)
+        dev_branch = ctx.config['branch']
+        branch = '--dev={branch}'.format(branch=dev_branch)
         if ceph_branch:
             option = ceph_branch
         else:
-            option = devcommit
+            option = branch
         install_nodes = './ceph-deploy install ' + option + " " + all_nodes
         estatus_install = execute_ceph_deploy(install_nodes)
         if estatus_install != 0: