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: add container support for batch 

https://tracker.ceph.com/issues/36363 has been resolved and the patch
has been backported to luminous and mimic so let's enable the container
support.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1541415
Signed-off-by: Sébastien Han <seb@redhat.com>
pull/3272/head
Sébastien Han 2018-10-26 16:30:32 +02:00
parent 1cdec4069a
commit 1df0a7acce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/ceph_volume.py
View File

@ -288,6 +288,9 @@ def batch(module, container_image):
cmd.extend(['--%s' % objectstore]) cmd.extend(['--%s' % objectstore])
cmd.append('--yes') cmd.append('--yes')
if container_image:
cmd.append('--prepare')
if crush_device_class: if crush_device_class:
cmd.extend(['--crush-device-class', crush_device_class]) cmd.extend(['--crush-device-class', crush_device_class])
@ -556,10 +559,6 @@ def run_module():
elif action == 'batch': elif action == 'batch':
# Batch prepare AND activate OSDs # Batch prepare AND activate OSDs
if container_image:
fatal(
'Batch operation is currently not supported on containerized deployment (https://tracker.ceph.com/issues/36363)', module) # noqa E501
report = module.params.get('report', None) report = module.params.get('report', None)
# Add --report flag for the idempotency test # Add --report flag for the idempotency test

1
library/test_ceph_volume.py
View File

@ -243,6 +243,7 @@ class TestCephVolumeModule(object):
'batch', 'batch',
'--filestore', '--filestore',
'--yes', '--yes',
'--prepare',
'--journal-size', '--journal-size',
'100', '100',
'/dev/sda', '/dev/sda',