]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
radosgw_zonegroup: add support check mode
authorSeena Fallah <seenafallah@gmail.com>
Sat, 16 Mar 2024 15:08:17 +0000 (16:08 +0100)
committerSeena Fallah <seenafallah@gmail.com>
Sat, 16 Mar 2024 22:46:18 +0000 (23:46 +0100)
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit beb046cba9498bc3febb282efef43a32c09c200b)

library/radosgw_zonegroup.py

index dac9c170964f4da70fb803f2c1185af40db7396b..533d58fa252166c1cbeae5aa269682902db9b796 100644 (file)
@@ -345,25 +345,14 @@ def run_module():
     endpoints = module.params.get('endpoints')
     master = module.params.get('master')
 
-    if module.check_mode:
-        module.exit_json(
-            changed=False,
-            stdout='',
-            stderr='',
-            rc=0,
-            start='',
-            end='',
-            delta='',
-        )
-
     startd = datetime.datetime.now()
     changed = False
 
     # will return either the image name or None
     container_image = is_containerized()
 
+    rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
     if state == "present":
-        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
         if rc == 0:
             zonegroup = json.loads(out)
             _rc, _cmd, _out, _err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
@@ -380,25 +369,23 @@ def run_module():
                 'master': master,
                 'realm_id': realm['id']
             }
-            if current != asked:
+            changed = current != asked
+            if changed and not module.check_mode:
                 rc, cmd, out, err = exec_commands(module, modify_zonegroup(module, container_image=container_image))  # noqa: E501
-                changed = True
         else:
-            rc, cmd, out, err = exec_commands(module, create_zonegroup(module, container_image=container_image))  # noqa: E501
+            if not module.check_mode:
+                rc, cmd, out, err = exec_commands(module, create_zonegroup(module, container_image=container_image))  # noqa: E501
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
         if rc == 0:
-            rc, cmd, out, err = exec_commands(module, remove_zonegroup(module, container_image=container_image))  # noqa: E501
+            if not module.check_mode:
+                rc, cmd, out, err = exec_commands(module, remove_zonegroup(module, container_image=container_image))  # noqa: E501
             changed = True
         else:
             rc = 0
             out = "Zonegroup {} doesn't exist".format(name)
 
-    elif state == "info":
-        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
-
     exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501