From 1fa1b5b751a0811ea12ac23b669c6c060588ac01 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 3 Sep 2020 13:11:31 -0400 Subject: [PATCH] ceph_pool: add idempotency to absent state When using the "absent" state on a non existing pool then the ceph_pool module will fail and return a python traceback. Instead we should check if the pool exit or not and execute the pool deletion according to the result. The state changed is now set when the pool is actually deleted. This also disable add_file_common_args because we don't manipulate files with this module. Signed-off-by: Dimitri Savineau (cherry picked from commit 047a3e2653eccf37b71366a8fb414c17a8163508) --- library/ceph_pool.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/library/ceph_pool.py b/library/ceph_pool.py index 77cbf280d..8da6b2a98 100644 --- a/library/ceph_pool.py +++ b/library/ceph_pool.py @@ -475,7 +475,6 @@ def run_module(): module = AnsibleModule( argument_spec=module_args, supports_check_mode=True, - add_file_common_args=True, ) # Gather module parameters in variables @@ -597,7 +596,13 @@ def run_module(): out = "Couldn't list pool(s) present on the cluster" elif state == "absent": - rc, cmd, out, err = exec_commands(module, remove_pool(cluster, name, user, user_key, container_image=container_image)) + rc, cmd, out, err = exec_commands(module, check_pool_exist(cluster, name, user, user_key, container_image=container_image)) + if rc == 0: + rc, cmd, out, err = exec_commands(module, remove_pool(cluster, name, user, user_key, container_image=container_image)) + changed = True + else: + rc = 0 + out = "Skipped, since pool {} doesn't exist".format(name) exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed) -- 2.47.3