Merge pull request #294 from ceph/mergify/bp/reef/pr-291

ceph_orch_apply: code change for clarity (backport #291)

library/ceph_orch_apply.py

@@ -91,21 +91,6 @@ def retrieve_current_spec(module: AnsibleModule, expected_spec: Dict) -> Dict:
         return yaml.safe_load(out[1])
 
 
-def change_required(current: Dict, expected: Dict) -> bool:
-    """ checks if the current config differs from what is expected """
-    if not current:
-        return True
-
-    for key, value in expected.items():
-        if key in current:
-            if current[key] != value:
-                return True
-            continue
-        else:
-            return True
-    return False
-
-
 def apply_spec(module: "AnsibleModule",
                data: str) -> Tuple[int, List[str], str, str]:
     cmd = build_base_cmd_orch(module)
@@ -152,7 +137,7 @@ def run_module() -> None:
     expected = parse_spec(module.params.get('spec'))
     current_spec = retrieve_current_spec(module, expected)
 
-    if change_required(current_spec, expected):
+    if not current_spec or current_spec != expected:
         rc, cmd, out, err = apply_spec(module, spec)
         changed = True
     else: