From: Sage Weil Date: Thu, 13 Feb 2020 02:35:56 +0000 (-0600) Subject: qa/tasks/cephadm: adapt to new cli X-Git-Tag: v15.1.1~425^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d689250d1ee708bcac6e9eabc73a32b83c69430;p=ceph.git qa/tasks/cephadm: adapt to new cli Signed-off-by: Sage Weil --- diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 7fa3026bbda6..b97edb52e0b2 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -464,7 +464,7 @@ def ceph_mons(ctx, config): log.info('Adding %s on %s' % (mon, remote.shortname)) num_mons += 1 _shell(ctx, cluster_name, remote, [ - 'ceph', 'orch', 'mon', 'update', + 'ceph', 'orch', 'apply', 'mon', str(num_mons), remote.shortname + ':' + ctx.ceph[cluster_name].mons[mon] + '=' + id_, ]) @@ -534,7 +534,7 @@ def ceph_mgrs(ctx, config): daemons[mgr] = (remote, id_) if nodes: _shell(ctx, cluster_name, remote, [ - 'ceph', 'orch', 'mgr', 'update', + 'ceph', 'orch', 'apply', 'mgr', str(len(nodes) + 1)] + nodes ) for mgr, i in daemons.items(): @@ -623,7 +623,7 @@ def ceph_mdss(ctx, config): daemons[role] = (remote, id_) if nodes: _shell(ctx, cluster_name, remote, [ - 'ceph', 'orch', 'mds', 'update', + 'ceph', 'orch', 'apply', 'mds', 'all', str(len(nodes))] + nodes )