Skip to content

Commit 8164efe

Browse files
committed
qa/cephadm: use cephadm ceph-volume directly to zap devs
This was running ceph-volume through the cephadm shell previously, but as we are trying to remove mount points from cephadm shell, this no longer works (specifically without the /dev mount) Signed-off-by: Adam King <[email protected]>
1 parent 4fa3926 commit 8164efe

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

qa/tasks/cephadm.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,8 +1086,18 @@ def ceph_osds(ctx, config):
10861086
short_dev = dev
10871087
log.info('Deploying %s on %s with %s...' % (
10881088
osd, remote.shortname, dev))
1089-
_shell(ctx, cluster_name, remote, [
1090-
'ceph-volume', 'lvm', 'zap', dev])
1089+
remote.run(
1090+
args=[
1091+
'sudo',
1092+
ctx.cephadm,
1093+
'--image', ctx.ceph[cluster_name].image,
1094+
'ceph-volume',
1095+
'-c', '/etc/ceph/{}.conf'.format(cluster_name),
1096+
'-k', '/etc/ceph/{}.client.admin.keyring'.format(cluster_name),
1097+
'--fsid', ctx.ceph[cluster_name].fsid,
1098+
'--', 'lvm', 'zap', dev
1099+
]
1100+
)
10911101
add_osd_args = ['ceph', 'orch', 'daemon', 'add', 'osd',
10921102
remote.shortname + ':' + short_dev]
10931103
osd_method = config.get('osd_method')

0 commit comments

Comments
 (0)