ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph_volume: support filestore to bluestore migration 

This commit adds the filestore to bluestore migration support in
ceph_volume module.

We must append to the executed command only the relevant options
according to what is passed in `osd_objectostore`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4887/head
Guillaume Abrioux 2020-01-07 16:29:48 +01:00
parent 42366f0a6c
commit aabba3baab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ceph_volume.py
View File

@ -319,10 +319,10 @@ def batch(module, container_image):
cmd.extend(batch_devices) cmd.extend(batch_devices)
if block_db_devices: if block_db_devices and objectstore == 'bluestore':
cmd.extend(['--db-devices', ' '.join(block_db_devices)]) cmd.extend(['--db-devices', ' '.join(block_db_devices)])
if wal_devices: if wal_devices and objectstore == 'bluestore':
cmd.extend(['--wal-devices', ' '.join(wal_devices)]) cmd.extend(['--wal-devices', ' '.join(wal_devices)])
return cmd return cmd
@ -377,15 +377,15 @@ def prepare_or_create_osd(module, action, container_image):
cmd.append('--data') cmd.append('--data')
cmd.append(data) cmd.append(data)
if journal: if journal and objectstore == 'filestore':
journal = get_journal(journal, journal_vg) journal = get_journal(journal, journal_vg)
cmd.extend(['--journal', journal]) cmd.extend(['--journal', journal])
if db: if db and objectstore == 'bluestore':
db = get_db(db, db_vg) db = get_db(db, db_vg)
cmd.extend(['--block.db', db]) cmd.extend(['--block.db', db])
if wal: if wal and objectstore == 'bluestore':
wal = get_wal(wal, wal_vg) wal = get_wal(wal, wal_vg)
cmd.extend(['--block.wal', wal]) cmd.extend(['--block.wal', wal])