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>

diff --git a/library/ceph_volume.py b/library/ceph_volume.py
index 7e9b916af7e471951928c691e275f675d635c3cb..8c42de6e221645784510921cd2928065fbcd66ec 100644 (file)
--- a/library/ceph_volume.py
+++ b/library/ceph_volume.py
@@ -714,10 +714,17 @@ def run_module():
             module.fail_json(msg='non-zero return code', **result)
 
         if not report:
-            # if not asking for a report, let's just run the batch command
-            changed = report_result['changed']
-            if changed:
-                # Batch prepare the OSD
+            if 'changed' in report_result:
+                # we have the old batch implementation
+                # if not asking for a report, let's just run the batch command
+                changed = report_result['changed']
+                if changed:
+                    # Batch prepare the OSD
+                    rc, cmd, out, err = exec_command(
+                        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: