Implement diff in ceph_orch_apply.py

library/ceph_orch_apply.py

@@ -82,7 +82,10 @@ def retrieve_current_spec(module: AnsibleModule, expected_spec: Dict) -> Dict:
     """ retrieve current config of the service """
     service: str = expected_spec["service_type"]
     cmd = build_base_cmd_orch(module)
-    cmd.extend(['ls', service, '--format=yaml'])
+    cmd.extend(['ls', service])
+    if 'service_name' in expected_spec:
+        cmd.extend([expected_spec["service_name"]])
+    cmd.extend(['--format=yaml'])
     out = module.run_command(cmd)
     if isinstance(out, str):
         # if there is no existing service, cephadm returns the string 'No services reported'
@@ -137,6 +140,14 @@ def run_module() -> None:
     expected = parse_spec(module.params.get('spec'))
     current_spec = retrieve_current_spec(module, expected)
 
+    # Remove dynamic attributes
+    if current_spec and 'status' in current_spec:
+        del current_spec["status"]
+    if current_spec and 'events' in current_spec:
+        del current_spec["events"]
+
+    diff = dict(before=yaml.safe_dump(current_spec), after=yaml.safe_dump(expected))
+
     if not current_spec or current_spec != expected:
         rc, cmd, out, err = apply_spec(module, spec)
         changed = True
@@ -154,7 +165,8 @@ def run_module() -> None:
         cmd=cmd,
         err=err,
         startd=startd,
-        changed=changed
+        changed=changed,
+        diff=diff
     )