]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Revert "library: Fix new-style modules check mode"
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 27 Nov 2020 07:53:55 +0000 (08:53 +0100)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Tue, 1 Dec 2020 14:53:26 +0000 (09:53 -0500)
This reverts commit bff21234303b9086dd8a352b52f2f47c5f3d2251.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
library/ceph_crush.py
library/ceph_key.py
library/ceph_volume.py

index 6ada0b45985e2a966ed8c9b46c6d4e5b39fb2a09..7891b666aa085d88649904c6d55fc39d43db0b42 100644 (file)
@@ -166,14 +166,14 @@ def run_module():
         changed=False,
         stdout='',
         stderr='',
-        rc=0,
+        rc='',
         start='',
         end='',
         delta='',
     )
 
     if module.check_mode:
-        module.exit_json(**result)
+        return result
 
     startd = datetime.datetime.now()
 
index 77bf40fa01acd9c00e61f656d13f7afe527b55e8..bc92e14949fec9bd0bdbd76f19aba3c05c6e8626 100644 (file)
@@ -530,14 +530,14 @@ def run_module():
         changed=changed,
         stdout='',
         stderr='',
-        rc=0,
+        rc='',
         start='',
         end='',
         delta='',
     )
 
     if module.check_mode:
-        module.exit_json(**result)
+        return result
 
     startd = datetime.datetime.now()
 
index f21241fcfc01705e40beb7a7908d8f51ddef7f33..2e0d794ce4b7bd87ced467c71cc5ba430509e535 100644 (file)
@@ -566,14 +566,14 @@ def run_module():
         changed=False,
         stdout='',
         stderr='',
-        rc=0,
+        rc='',
         start='',
         end='',
         delta='',
     )
 
     if module.check_mode:
-        module.exit_json(**result)
+        return result
 
     # start execution
     startd = datetime.datetime.now()