summaryrefslogtreecommitdiffstats
path: root/qa/tasks/ceph_deploy.py
diff options
context:
space:
mode:
authorVasu Kulkarni <vasu@redhat.com>2016-12-15 23:11:00 +0100
committerVasu Kulkarni <vasu@redhat.com>2016-12-15 23:11:00 +0100
commit9f04a7b32e0d9b2dbabcfafb1d65b62460123fd9 (patch)
treeddf0d5e82ee23c80f8572555a468ed6c6134286a /qa/tasks/ceph_deploy.py
parentMerge pull request #12511 from liewegas/wip-workunits (diff)
downloadceph-9f04a7b32e0d9b2dbabcfafb1d65b62460123fd9.tar.xz
ceph-9f04a7b32e0d9b2dbabcfafb1d65b62460123fd9.zip
use dev option instead of dev-commit
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
Diffstat (limited to '')
-rw-r--r--qa/tasks/ceph_deploy.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index 9453c49a5a3..c0ea7842346 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: