From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 15 Dec 2016 22:11:00 +0000 (-0800)
Subject: use dev option instead of dev-commit
X-Git-Tag: v11.1.1~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12514%2Fhead;p=ceph.git

use dev option instead of dev-commit

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index 9453c49a5a3d..c0ea78423461 100644
--- a/qa/tasks/ceph_deploy.py
+++ b/qa/tasks/ceph_deploy.py
@@ -272,12 +272,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: