library: move `fatal()` into ca_common.py

this function is defined in various modules, let's move it to
`ca_common.py`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/library/ceph_crush.py b/library/ceph_crush.py
index 6ada0b45985e2a966ed8c9b46c6d4e5b39fb2a09..7cb9688be23f44c7cc8671022c381965ee13a1e1 100644 (file)
--- a/library/ceph_crush.py
+++ b/library/ceph_crush.py
@@ -8,6 +8,10 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
+try:
+    from ansible.module_utils.ca_common import fatal
+except ImportError:
+    from module_utils.ca_common import fatal
 import datetime
 
 ANSIBLE_METADATA = {
@@ -62,16 +66,6 @@ EXAMPLES = '''
 RETURN = '''#  '''
 
 
-def fatal(message, module):
-    '''
-    Report a fatal error and exit
-    '''
-    if module:
-        module.fail_json(msg=message, rc=1)
-    else:
-        raise(Exception(message))
-
-
 def generate_cmd(cluster, subcommand, bucket, bucket_type, containerized=None):
     '''
     Generate command line to execute

diff --git a/library/ceph_key.py b/library/ceph_key.py
index 6b98e075cc1ab97120656faa44d8c501dd0f9077..231e93dae905c69f91450e2aea09ea10a380020b 100644 (file)
--- a/library/ceph_key.py
+++ b/library/ceph_key.py
@@ -19,9 +19,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import is_containerized, container_exec
+    from ansible.module_utils.ca_common import is_containerized, container_exec, fatal
 except ImportError:
-    from module_utils.ca_common import is_containerized, container_exec
+    from module_utils.ca_common import is_containerized, container_exec, fatal
 import datetime
 import json
 import os
@@ -219,17 +219,6 @@ def str_to_bool(val):
         raise ValueError("Invalid input value: %s" % val)
 
 
-def fatal(message, module):
-    '''
-    Report a fatal error and exit
-    '''
-
-    if module:
-        module.fail_json(msg=message, rc=1)
-    else:
-        raise(Exception(message))
-
-
 def generate_secret():
     '''
     Generate a CephX secret

diff --git a/library/ceph_volume.py b/library/ceph_volume.py
index d323255237a863b0fd9c606ac395d145daf818bd..dd315e8b8ae32bd118089d777fbb0db55361ec8e 100644 (file)
--- a/library/ceph_volume.py
+++ b/library/ceph_volume.py
@@ -2,9 +2,9 @@
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exec_command, is_containerized
+    from ansible.module_utils.ca_common import exec_command, is_containerized, fatal
 except ImportError:
-    from module_utils.ca_common import exec_command, is_containerized
+    from module_utils.ca_common import exec_command, is_containerized, fatal
 import datetime
 import copy
 import json
@@ -186,17 +186,6 @@ EXAMPLES = '''
 '''
 
 
-def fatal(message, module):
-    '''
-    Report a fatal error and exit
-    '''
-
-    if module:
-        module.fail_json(msg=message, changed=False, rc=1)
-    else:
-        raise(Exception(message))
-
-
 def container_exec(binary, container_image):
     '''
     Build the docker CLI to run a command inside a container

diff --git a/module_utils/ca_common.py b/module_utils/ca_common.py
index 0a70a661cf574708179fb23d3c8e27de928862b9..c63ae1be6f1f0f3c6bf785a325779ca9a75cee3c 100644 (file)
--- a/module_utils/ca_common.py
+++ b/module_utils/ca_common.py
@@ -96,3 +96,13 @@ def exit_module(module, out, rc, cmd, err, startd, changed=False):
         changed=changed,
     )
     module.exit_json(**result)
+
+def fatal(message, module):
+    '''
+    Report a fatal error and exit
+    '''
+
+    if module:
+        module.fail_json(msg=message, rc=1)
+    else:
+        raise(Exception(message))