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.py: add support for batch refactored code 

See https://github.com/ceph/ceph/pull/34740 for the batch changes.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit d90834b77f)
pull/5580/head
Jan Fajerski 2020-06-26 10:29:24 +02:00 committed by Guillaume Abrioux
parent 328db8bee1
commit 3e4c2e33e6
1 changed files with 11 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

@ -703,12 +703,19 @@ def run_module():
module.fail_json(msg='non-zero return code', **result) module.fail_json(msg='non-zero return code', **result)
if not report: if not report:
if 'changed' in report_result:
# we have the old batch implementation
# if not asking for a report, let's just run the batch command # if not asking for a report, let's just run the batch command
changed = report_result['changed'] changed = report_result['changed']
if changed: if changed:
# Batch prepare the OSD # Batch prepare the OSD
rc, cmd, out, err = exec_command( rc, cmd, out, err = exec_command(
module, batch(module, container_image)) module, batch(module, container_image))
else:
# we have the refactored batch, its idempotent so lets just
# run it
rc, cmd, out, err = exec_command(
module, batch(module, container_image))
else: else:
cmd = batch_report_cmd cmd = batch_report_cmd