Revert "Initialize rbd pool at pool creation"

This reverts commit 5a750aa955b67187c58d4034517b9d24b60daaff.

Signed-off-by: Teoman ONAY <tonay@ibm.com>

diff --git a/library/ceph_crush_rule.py b/library/ceph_crush_rule.py
index 88ec8434cbcff032aafad1f9711797aa7380395d..87d4f1e2d73f417304091cecf61d3eb2e16773f8 100644 (file)
--- a/library/ceph_crush_rule.py
+++ b/library/ceph_crush_rule.py
@@ -18,12 +18,12 @@ __metaclass__ = type
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible.module_utils.ca_common import exit_module, \
-                                               generate_cmd, \
+                                               generate_ceph_cmd, \
                                                is_containerized, \
                                                exec_command
 except ImportError:
     from module_utils.ca_common import exit_module, \
-                                       generate_cmd, \
+                                       generate_ceph_cmd, \
                                        is_containerized, \
                                        exec_command
 import datetime
@@ -142,10 +142,10 @@ def create_rule(module, container_image=None):
         if profile:
             args.append(profile)
 
-    cmd = generate_cmd(sub_cmd=['osd', 'crush', 'rule'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
+                            args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -160,10 +160,10 @@ def get_rule(module, container_image=None):
 
     args = ['dump', name, '--format=json']
 
-    cmd = generate_cmd(sub_cmd=['osd', 'crush', 'rule'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
+                            args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -178,10 +178,10 @@ def remove_rule(module, container_image=None):
 
     args = ['rm', name]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'crush', 'rule'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
+                            args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 

diff --git a/library/ceph_dashboard_user.py b/library/ceph_dashboard_user.py
index 89fdafff91352c5b3ac7d61720c0c9543e8e8ebb..22cc760f19dd412781d2b58a7388b24db7eb4e86 100644 (file)
--- a/library/ceph_dashboard_user.py
+++ b/library/ceph_dashboard_user.py
@@ -17,13 +17,13 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import generate_cmd, \
+    from ansible.module_utils.ca_common import generate_ceph_cmd, \
                                                is_containerized, \
                                                exec_command, \
                                                exit_module, \
                                                fatal
 except ImportError:
-    from module_utils.ca_common import generate_cmd, is_containerized, exec_command, exit_module, fatal  # noqa: E501
+    from module_utils.ca_common import generate_ceph_cmd, is_containerized, exec_command, exit_module, fatal  # noqa: E501
 
 import datetime
 import json
@@ -123,11 +123,11 @@ def create_user(module, container_image=None):
 
     args = ['ac-user-create', '-i', '-',  name]
 
-    cmd = generate_cmd(sub_cmd=['dashboard'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image,
-                       interactive=True)
+    cmd = generate_ceph_cmd(sub_cmd=['dashboard'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image,
+                            interactive=True)
 
     return cmd
 
@@ -145,10 +145,10 @@ def set_roles(module, container_image=None):
 
     args.extend(roles)
 
-    cmd = generate_cmd(sub_cmd=['dashboard'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['dashboard'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -163,11 +163,11 @@ def set_password(module, container_image=None):
 
     args = ['ac-user-set-password', '-i', '-', name]
 
-    cmd = generate_cmd(sub_cmd=['dashboard'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image,
-                       interactive=True)
+    cmd = generate_ceph_cmd(sub_cmd=['dashboard'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image,
+                            interactive=True)
 
     return cmd
 
@@ -182,10 +182,10 @@ def get_user(module, container_image=None):
 
     args = ['ac-user-show', name, '--format=json']
 
-    cmd = generate_cmd(sub_cmd=['dashboard'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['dashboard'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -200,10 +200,10 @@ def remove_user(module, container_image=None):
 
     args = ['ac-user-delete', name]
 
-    cmd = generate_cmd(sub_cmd=['dashboard'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['dashboard'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 

diff --git a/library/ceph_ec_profile.py b/library/ceph_ec_profile.py
index 380d00b91a6fb52643021b6f4a1d415da1a6c14a..183d2c5d0ec83d7efbf9bdf8896b6bc3054f3a44 100644 (file)
--- a/library/ceph_ec_profile.py
+++ b/library/ceph_ec_profile.py
@@ -18,12 +18,12 @@ __metaclass__ = type
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible.module_utils.ca_common import is_containerized, \
-                                               generate_cmd, \
+                                               generate_ceph_cmd, \
                                                exec_command, \
                                                exit_module
 except ImportError:
     from module_utils.ca_common import is_containerized, \
-                                            generate_cmd, \
+                                            generate_ceph_cmd, \
                                             exec_command, \
                                             exit_module
 import datetime
@@ -113,10 +113,10 @@ def get_profile(module, name, cluster='ceph', container_image=None):
 
     args = ['get', name, '--format=json']
 
-    cmd = generate_cmd(sub_cmd=['osd', 'erasure-code-profile'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'erasure-code-profile'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -132,10 +132,10 @@ def create_profile(module, name, k, m, stripe_unit, cluster='ceph', force=False,
     if force:
         args.append('--force')
 
-    cmd = generate_cmd(sub_cmd=['osd', 'erasure-code-profile'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'erasure-code-profile'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -147,10 +147,10 @@ def delete_profile(module, name, cluster='ceph', container_image=None):
 
     args = ['rm', name]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'erasure-code-profile'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'erasure-code-profile'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -205,12 +205,7 @@ def run_module():
             current_profile = json.loads(out)
             if current_profile['k'] != k or \
                current_profile['m'] != m or \
-<<<<<<< HEAD
                current_profile.get('stripe_unit', stripe_unit) != stripe_unit:
-=======
-               current_profile.get('stripe_unit', stripe_unit) != stripe_unit or \
-               current_profile.get('crush-device-class', crush_device_class) != crush_device_class:  # noqa: E501
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
                 rc, cmd, out, err = exec_command(module,
                                                  create_profile(module,
                                                                 name,

diff --git a/library/ceph_fs.py b/library/ceph_fs.py
index 10db2b161b324544939f36599d8696b90663cbed..1be8881dc1a4747fd546cc6d8be38e75264c60d5 100644 (file)
--- a/library/ceph_fs.py
+++ b/library/ceph_fs.py
@@ -19,12 +19,12 @@ from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible.module_utils.ca_common import is_containerized, \
                                                exec_command, \
-                                               generate_cmd, \
+                                               generate_ceph_cmd, \
                                                exit_module
 except ImportError:
     from module_utils.ca_common import is_containerized, \
                                        exec_command, \
-                                       generate_cmd, \
+                                       generate_ceph_cmd, \
                                        exit_module
 
 import datetime
@@ -119,10 +119,10 @@ def create_fs(module, container_image=None):
 
     args = ['new', name, metadata, data]
 
-    cmd = generate_cmd(sub_cmd=['fs'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['fs'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -137,10 +137,10 @@ def get_fs(module, container_image=None):
 
     args = ['get', name, '--format=json']
 
-    cmd = generate_cmd(sub_cmd=['fs'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['fs'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -155,10 +155,10 @@ def remove_fs(module, container_image=None):
 
     args = ['rm', name, '--yes-i-really-mean-it']
 
-    cmd = generate_cmd(sub_cmd=['fs'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['fs'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -173,10 +173,10 @@ def fail_fs(module, container_image=None):
 
     args = ['fail', name]
 
-    cmd = generate_cmd(sub_cmd=['fs'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['fs'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 
@@ -192,10 +192,10 @@ def set_fs(module, container_image=None):
 
     args = ['set', name, 'max_mds', str(max_mds)]
 
-    cmd = generate_cmd(sub_cmd=['fs'],
-                       args=args,
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['fs'],
+                            args=args,
+                            cluster=cluster,
+                            container_image=container_image)
 
     return cmd
 

diff --git a/library/ceph_key.py b/library/ceph_key.py
index 572c29278f4be7584f97c6929cf76d544c3a4e64..382d4f1f8e29a390048f25ae3a52e78001092872 100644 (file)
--- a/library/ceph_key.py
+++ b/library/ceph_key.py
@@ -19,21 +19,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-<<<<<<< HEAD
     from ansible.module_utils.ca_common import is_containerized, container_exec, fatal
 except ImportError:
     from module_utils.ca_common import is_containerized, container_exec, fatal
-=======
-    from ansible.module_utils.ca_common import generate_cmd, \
-                                               is_containerized, \
-                                               container_exec, \
-                                               fatal
-except ImportError:
-    from module_utils.ca_common import generate_cmd, \
-                                       is_containerized, \
-                                       container_exec, \
-                                       fatal
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 import datetime
 import json
 import os
@@ -338,17 +326,8 @@ def create_key(module, result, cluster, user, user_key_path, name, secret, caps,
         cluster, name, secret, caps, dest, container_image))
 
     if import_key or user != 'client.admin':
-<<<<<<< HEAD
         cmd_list.append(generate_ceph_cmd(
             cluster, args, user, user_key_path, container_image))
-=======
-        cmd_list.append(generate_cmd(sub_cmd=['auth'],
-                                     args=args,
-                                     cluster=cluster,
-                                     user=user,
-                                     user_key=user_key,
-                                     container_image=container_image))
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 
     return cmd_list
 
@@ -365,17 +344,8 @@ def delete_key(cluster, user, user_key_path, name, container_image=None):
         name,
     ]
 
-<<<<<<< HEAD
     cmd_list.append(generate_ceph_cmd(
         cluster, args, user, user_key_path, container_image))
-=======
-    cmd_list.append(generate_cmd(sub_cmd=['auth'],
-                                 args=args,
-                                 cluster=cluster,
-                                 user=user,
-                                 user_key=user_key,
-                                 container_image=container_image))
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 
     return cmd_list
 
@@ -394,17 +364,8 @@ def get_key(cluster, user, user_key_path, name, dest, container_image=None):
         dest,
     ]
 
-<<<<<<< HEAD
     cmd_list.append(generate_ceph_cmd(
         cluster, args, user, user_key_path, container_image))
-=======
-    cmd_list.append(generate_cmd(sub_cmd=['auth'],
-                                 args=args,
-                                 cluster=cluster,
-                                 user=user,
-                                 user_key=user_key,
-                                 container_image=container_image))
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 
     return cmd_list
 
@@ -423,17 +384,8 @@ def info_key(cluster, name, user, user_key_path, output_format, container_image=
         output_format,
     ]
 
-<<<<<<< HEAD
     cmd_list.append(generate_ceph_cmd(
         cluster, args, user, user_key_path, container_image))
-=======
-    cmd_list.append(generate_cmd(sub_cmd=['auth'],
-                                 args=args,
-                                 cluster=cluster,
-                                 user=user,
-                                 user_key=user_key,
-                                 container_image=container_image))
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 
     return cmd_list
 
@@ -451,17 +403,8 @@ def list_keys(cluster, user, user_key_path, container_image=None):
         'json',
     ]
 
-<<<<<<< HEAD
     cmd_list.append(generate_ceph_cmd(
         cluster, args, user, user_key_path, container_image))
-=======
-    cmd_list.append(generate_cmd(sub_cmd=['auth'],
-                                 args=args,
-                                 cluster=cluster,
-                                 user=user,
-                                 user_key=user_key,
-                                 container_image=container_image))
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
 
     return cmd_list
 

diff --git a/library/ceph_mgr_module.py b/library/ceph_mgr_module.py
index 0c2d177e414aa238ae8b1d150f895ce9496be870..1971159d3f912c379e48b187e318b814307b9418 100644 (file)
--- a/library/ceph_mgr_module.py
+++ b/library/ceph_mgr_module.py
@@ -18,11 +18,11 @@ __metaclass__ = type
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible.module_utils.ca_common import exit_module, \
-                                               generate_cmd, \
+                                               generate_ceph_cmd, \
                                                is_containerized
 except ImportError:
     from module_utils.ca_common import exit_module, \
-                                       generate_cmd, \
+                                       generate_ceph_cmd, \
                                        is_containerized
 import datetime
 
@@ -97,10 +97,10 @@ def main():
 
     container_image = is_containerized()
 
-    cmd = generate_cmd(sub_cmd=['mgr', 'module'],
-                       args=[state, name],
-                       cluster=cluster,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(['mgr', 'module'],
+                            [state, name],
+                            cluster=cluster,
+                            container_image=container_image)
 
     if module.check_mode:
         exit_module(

diff --git a/library/ceph_osd.py b/library/ceph_osd.py
index 0eadc938d55ab45504a095b66105e02363bb1d07..63e15010d75626664f91f29e950ccffb3c93908d 100644 (file)
--- a/library/ceph_osd.py
+++ b/library/ceph_osd.py
@@ -17,9 +17,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exit_module, generate_cmd, is_containerized  # noqa: E501
+    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized  # noqa: E501
 except ImportError:
-    from module_utils.ca_common import exit_module, generate_cmd, is_containerized  # noqa: E501
+    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized  # noqa: E501
 import datetime
 
 
@@ -111,7 +111,7 @@ def main():
 
     container_image = is_containerized()
 
-    cmd = generate_cmd(sub_cmd=['osd', state], args=ids, cluster=cluster, container_image=container_image)  # noqa: E501
+    cmd = generate_ceph_cmd(['osd', state], ids, cluster=cluster, container_image=container_image)  # noqa: E501
 
     if state in ['destroy', 'purge']:
         cmd.append('--yes-i-really-mean-it')

diff --git a/library/ceph_osd_flag.py b/library/ceph_osd_flag.py
index ef21eaf189a5899a98952d19b50fd2f7c12dc27f..1e6fe961192714f48d401125c13fa9f76c73f5d0 100644 (file)
--- a/library/ceph_osd_flag.py
+++ b/library/ceph_osd_flag.py
@@ -18,11 +18,11 @@ __metaclass__ = type
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible.module_utils.ca_common import exit_module, \
-                                               generate_cmd, \
+                                               generate_ceph_cmd, \
                                                is_containerized
 except ImportError:
     from module_utils.ca_common import exit_module, \
-                                       generate_cmd, \
+                                       generate_ceph_cmd, \
                                        is_containerized
 import datetime
 
@@ -99,9 +99,9 @@ def main():
     container_image = is_containerized()
 
     if state == 'present':
-        cmd = generate_cmd(sub_cmd=['osd', 'set'], args=[name], cluster=cluster, container_image=container_image)  # noqa: E501
+        cmd = generate_ceph_cmd(['osd', 'set'], [name], cluster=cluster, container_image=container_image)  # noqa: E501
     else:
-        cmd = generate_cmd(sub_cmd=['osd', 'unset'], args=[name], cluster=cluster, container_image=container_image)  # noqa: E501
+        cmd = generate_ceph_cmd(['osd', 'unset'], [name], cluster=cluster, container_image=container_image)  # noqa: E501
 
     if module.check_mode:
         exit_module(

diff --git a/library/ceph_pool.py b/library/ceph_pool.py
index 9451a71c398ace7ace0f610f01961e349e21e831..417236289c48e4e4886f1c3213aac88f164b9268 100644 (file)
--- a/library/ceph_pool.py
+++ b/library/ceph_pool.py
@@ -19,14 +19,14 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import generate_cmd, \
-                                               pre_generate_cmd, \
+    from ansible.module_utils.ca_common import generate_ceph_cmd, \
+                                               pre_generate_ceph_cmd, \
                                                is_containerized, \
                                                exec_command, \
                                                exit_module
 except ImportError:
-    from module_utils.ca_common import generate_cmd, \
-                                       pre_generate_cmd, \
+    from module_utils.ca_common import generate_ceph_cmd, \
+                                       pre_generate_ceph_cmd, \
                                        is_containerized, \
                                        exec_command, \
                                        exit_module
@@ -167,12 +167,12 @@ def check_pool_exist(cluster,
 
     args = ['stats', name, '-f', output_format]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -182,7 +182,7 @@ def generate_get_config_cmd(param,
                             user,
                             user_key,
                             container_image=None):
-    _cmd = pre_generate_cmd('ceph', container_image=container_image)
+    _cmd = pre_generate_ceph_cmd(container_image=container_image)
     args = [
         '-n',
         user,
@@ -211,12 +211,12 @@ def get_application_pool(cluster,
 
     args = ['application', 'get', name, '-f', output_format]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -233,34 +233,12 @@ def enable_application_pool(cluster,
 
     args = ['application', 'enable', name, application]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
-
-    return cmd
-
-
-def init_rbd_pool(cluster,
-                  name,
-                  user,
-                  user_key,
-                  container_image=None):
-    '''
-    Initialize a rbd pool
-    '''
-
-    args = [name]
-
-    cmd = generate_cmd(cmd='rbd',
-                       sub_cmd=['pool', 'init'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -278,12 +256,12 @@ def disable_application_pool(cluster,
     args = ['application', 'disable', name,
             application, '--yes-i-really-mean-it']
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -301,12 +279,12 @@ def get_pool_details(module,
 
     args = ['ls', 'detail', '-f', output_format]
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     rc, cmd, out, err = exec_command(module, cmd)
 
@@ -390,17 +368,18 @@ def list_pools(cluster,
 
     args.extend(['-f', output_format])
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
 
 def create_pool(cluster,
+                name,
                 user,
                 user_key,
                 user_pool_config,
@@ -444,12 +423,12 @@ def create_pool(cluster,
                      '--autoscale-mode',
                      user_pool_config['pg_autoscale_mode']['value']])
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -461,12 +440,12 @@ def remove_pool(cluster, name, user, user_key, container_image=None):
 
     args = ['rm', name, name, '--yes-i-really-really-mean-it']
 
-    cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                       args=args,
-                       cluster=cluster,
-                       user=user,
-                       user_key=user_key,
-                       container_image=container_image)
+    cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                            args=args,
+                            cluster=cluster,
+                            user=user,
+                            user_key=user_key,
+                            container_image=container_image)
 
     return cmd
 
@@ -486,12 +465,12 @@ def update_pool(module, cluster, name,
                     delta[key]['cli_set_opt'],
                     delta[key]['value']]
 
-            cmd = generate_cmd(sub_cmd=['osd', 'pool'],
-                               args=args,
-                               cluster=cluster,
-                               user=user,
-                               user_key=user_key,
-                               container_image=container_image)
+            cmd = generate_ceph_cmd(sub_cmd=['osd', 'pool'],
+                                    args=args,
+                                    cluster=cluster,
+                                    user=user,
+                                    user_key=user_key,
+                                    container_image=container_image)
 
             rc, cmd, out, err = exec_command(module, cmd)
             if rc != 0:
@@ -655,6 +634,7 @@ def run_module():
         else:
             rc, cmd, out, err = exec_command(module,
                                              create_pool(cluster,
+                                                         name,
                                                          user,
                                                          user_key,
                                                          user_pool_config=user_pool_config,  # noqa: E501
@@ -667,13 +647,6 @@ def run_module():
                                                                    user,
                                                                    user_key,
                                                                    container_image=container_image))  # noqa: E501
-                if rc == 0 and user_pool_config['application']['value'] == 'rbd':  # noqa: E501
-                    rc, cmd, out, err = exec_command(module,
-                                                     init_rbd_pool(cluster,
-                                                                   user_pool_config['pool_name']['value'],  # noqa: E501
-                                                                   user,
-                                                                   user_key,
-                                                                   container_image=container_image))  # noqa: E501
             if user_pool_config['min_size']['value']:
                 # not implemented yet
                 pass

diff --git a/module_utils/ca_common.py b/module_utils/ca_common.py
index f478b75e59a0172e3951c26ca8f43c574782684b..7bd70ce1620abbfa8ae14d26ee43a8f2133729d4 100644 (file)
--- a/module_utils/ca_common.py
+++ b/module_utils/ca_common.py
@@ -2,22 +2,15 @@ import os
 import datetime
 
 
-def generate_cmd(cmd='ceph',
-                 sub_cmd=None,
-                 args=None,
-                 user_key=None,
-                 cluster='ceph',
-                 user='client.admin',
-                 container_image=None,
-                 interactive=False):
+def generate_ceph_cmd(sub_cmd, args, user_key=None, cluster='ceph', user='client.admin', container_image=None, interactive=False):
     '''
     Generate 'ceph' command line to execute
     '''
 
-    if user_key is None:
+    if not user_key:
         user_key = '/etc/ceph/{}.{}.keyring'.format(cluster, user)
 
-    cmd = pre_generate_cmd(cmd, container_image=container_image, interactive=interactive)  # noqa: E501
+    cmd = pre_generate_ceph_cmd(container_image=container_image, interactive=interactive)
 
     base_cmd = [
         '-n',
@@ -27,11 +20,8 @@ def generate_cmd(cmd='ceph',
         '--cluster',
         cluster
     ]
-
-    if sub_cmd is not None:
-        base_cmd.extend(sub_cmd)
-
-    cmd.extend(base_cmd) if args is None else cmd.extend(base_cmd + args)
+    base_cmd.extend(sub_cmd)
+    cmd.extend(base_cmd + args)
 
     return cmd
 
@@ -69,14 +59,14 @@ def is_containerized():
     return container_image
 
 
-def pre_generate_cmd(cmd, container_image=None, interactive=False):
+def pre_generate_ceph_cmd(container_image=None, interactive=False):
     '''
-    Generate ceph prefix command
+    Generate ceph prefix comaand
     '''
     if container_image:
-        cmd = container_exec(cmd, container_image, interactive=interactive)
+        cmd = container_exec('ceph', container_image, interactive=interactive)
     else:
-        cmd = [cmd]
+        cmd = ['ceph']
 
     return cmd
 
@@ -94,7 +84,7 @@ def exec_command(module, cmd, stdin=None):
     return rc, cmd, out, err
 
 
-def exit_module(module, out, rc, cmd, err, startd, changed=False, diff=dict(before="", after="")):  # noqa: E501
+def exit_module(module, out, rc, cmd, err, startd, changed=False, diff=dict(before="", after="")):
     endd = datetime.datetime.now()
     delta = endd - startd
 

diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py
index 79060f85ea07969b2a28b8fdacaf6744dc888735..7f52f245ce9ed1aede8f81fd737f6a5860aabbbd 100644 (file)
--- a/tests/library/test_ceph_key.py
+++ b/tests/library/test_ceph_key.py
@@ -62,17 +62,8 @@ class TestCephKeyModule(object):
             'auth',
             'arg'
         ]
-<<<<<<< HEAD
         result = ceph_key.generate_ceph_cmd(
             fake_cluster, fake_args, fake_user, fake_key)
-=======
-        result = ceph_key.generate_cmd(
-            sub_cmd=['auth'],
-            args=fake_args,
-            cluster=fake_cluster,
-            user=fake_user,
-            user_key=fake_user_key)
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
         assert result == expected_command_list
 
     def test_generate_ceph_cmd_list_container(self):
@@ -98,18 +89,8 @@ class TestCephKeyModule(object):
                                  fake_cluster,
                                  'auth',
                                  'arg']
-<<<<<<< HEAD
         result = ceph_key.generate_ceph_cmd(
             fake_cluster, fake_args, fake_user, fake_user_key, fake_container_image)
-=======
-        result = ceph_key.generate_cmd(
-            sub_cmd=['auth'],
-            args=fake_args,
-            cluster=fake_cluster,
-            user=fake_user,
-            user_key=fake_user_key,
-            container_image=fake_container_image)
->>>>>>> c39bbc3de (Initialize rbd pool at pool creation)
         assert result == expected_command_list
 
     def test_generate_ceph_authtool_cmd_non_container_no_auid(self):

diff --git a/tests/library/test_ceph_pool.py b/tests/library/test_ceph_pool.py
index f072c26115cabc7c2f926bb3de5796567c3dbbc6..2ce40560fc5235511b4bf633340ceebce055e7e2 100644 (file)
--- a/tests/library/test_ceph_pool.py
+++ b/tests/library/test_ceph_pool.py
@@ -2,7 +2,6 @@ import os
 import sys
 import ceph_pool
 from mock.mock import patch
-import pytest
 
 sys.path.append('./library')
 fake_user = 'client.admin'
@@ -283,53 +282,6 @@ class TestCephPoolModule(object):
 
         assert cmd == expected_command
 
-    @pytest.mark.parametrize("container_image", [None, fake_container_image_name])
-    def test_init_rbd_pool(self, container_image):
-        if container_image:
-            expected_command = [
-                    'podman',
-                    'run',
-                    '--rm',
-                    '--net=host',
-                    '-v',
-                    '/etc/ceph:/etc/ceph:z',
-                    '-v',
-                    '/var/lib/ceph/:/var/lib/ceph/:z',
-                    '-v',
-                    '/var/log/ceph/:/var/log/ceph/:z',
-                    '--entrypoint=rbd',
-                    fake_container_image_name,
-                    '-n',
-                    fake_user,
-                    '-k',
-                    fake_user_key,
-                    '--cluster',
-                    fake_cluster_name,
-                    'pool',
-                    'init',
-                    self.fake_user_pool_config['pool_name']['value']
-            ]
-        else:
-            expected_command = [
-                    'rbd',
-                    '-n',
-                    fake_user,
-                    '-k',
-                    fake_user_key,
-                    '--cluster',
-                    fake_cluster_name,
-                    'pool',
-                    'init',
-                    self.fake_user_pool_config['pool_name']['value']
-            ]
-
-        cmd = ceph_pool.init_rbd_pool(fake_cluster_name,
-                                      self.fake_user_pool_config['pool_name']['value'],
-                                      fake_user, fake_user_key,
-                                      container_image)
-
-        assert cmd == expected_command
-
     def test_disable_application_pool(self):
         expected_command = [
                 'podman',
@@ -490,6 +442,7 @@ class TestCephPoolModule(object):
         ]
 
         cmd = ceph_pool.create_pool(fake_cluster_name,
+                                    self.fake_user_pool_config['pool_name']['value'],
                                     fake_user, fake_user_key, self.fake_user_pool_config,
                                     container_image=fake_container_image_name)
 
@@ -536,6 +489,7 @@ class TestCephPoolModule(object):
         ]
 
         cmd = ceph_pool.create_pool(fake_cluster_name,
+                                    self.fake_user_pool_config['pool_name']['value'],
                                     fake_user, fake_user_key,
                                     self.fake_user_pool_config,
                                     container_image=fake_container_image_name)
@@ -581,6 +535,7 @@ class TestCephPoolModule(object):
         ]
 
         cmd = ceph_pool.create_pool(fake_cluster_name,
+                                    self.fake_user_pool_config['pool_name']['value'],
                                     fake_user, fake_user_key, self.fake_user_pool_config,
                                     container_image=fake_container_image_name)
 
@@ -628,6 +583,7 @@ class TestCephPoolModule(object):
         ]
 
         cmd = ceph_pool.create_pool(fake_cluster_name,
+                                    self.fake_user_pool_config['pool_name']['value'],
                                     fake_user, fake_user_key, self.fake_user_pool_config,
                                     container_image=fake_container_image_name)
 

diff --git a/tests/module_utils/test_ca_common.py b/tests/module_utils/test_ca_common.py
index e562bae2f69116557cc66744cfcbe95225609ed8..2d0ea5ccf2cd49b46a606423ffcd38ab1bdc75e2 100644 (file)
--- a/tests/module_utils/test_ca_common.py
+++ b/tests/module_utils/test_ca_common.py
@@ -38,17 +38,17 @@ class TestCommon(object):
 
     @pytest.mark.parametrize('image', [None, fake_container_image])
     @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': fake_container_binary})
-    def test_pre_generate_cmd(self, image):
+    def test_pre_generate_ceph_cmd(self, image):
         if image:
             expected_cmd = self.fake_container_cmd
         else:
             expected_cmd = [self.fake_binary]
 
-        assert ca_common.pre_generate_cmd(self.fake_binary, image) == expected_cmd  # noqa: E501
+        assert ca_common.pre_generate_ceph_cmd(image) == expected_cmd
 
     @pytest.mark.parametrize('image', [None, fake_container_image])
     @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': fake_container_binary})
-    def test_generate_cmd(self, image):
+    def test_generate_ceph_cmd(self, image):
         sub_cmd = ['osd', 'pool']
         args = ['create', 'foo']
         if image:
@@ -64,11 +64,11 @@ class TestCommon(object):
             'osd', 'pool',
             'create', 'foo'
         ])
-        assert ca_common.generate_cmd(sub_cmd=sub_cmd, args=args, cluster=self.fake_cluster, container_image=image) == expected_cmd  # noqa: E501
+        assert ca_common.generate_ceph_cmd(sub_cmd, args, cluster=self.fake_cluster, container_image=image) == expected_cmd
 
     @pytest.mark.parametrize('image', [None, fake_container_image])
     @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': fake_container_binary})
-    def test_generate_cmd_different_cluster_name(self, image):
+    def test_generate_ceph_cmd_different_cluster_name(self, image):
         sub_cmd = ['osd', 'pool']
         args = ['create', 'foo']
         if image:
@@ -84,12 +84,12 @@ class TestCommon(object):
             'osd', 'pool',
             'create', 'foo'
         ])
-        result = ca_common.generate_cmd(sub_cmd=sub_cmd, args=args, cluster='foo', container_image=image)  # noqa: E501
+        result = ca_common.generate_ceph_cmd(sub_cmd, args, cluster='foo', container_image=image)
         assert result == expected_cmd
 
     @pytest.mark.parametrize('image', [None, fake_container_image])
     @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': fake_container_binary})
-    def test_generate_cmd_different_cluster_name_and_user(self, image):
+    def test_generate_ceph_cmd_different_cluster_name_and_user(self, image):
         sub_cmd = ['osd', 'pool']
         args = ['create', 'foo']
         if image:
@@ -105,12 +105,12 @@ class TestCommon(object):
             'osd', 'pool',
             'create', 'foo'
         ])
-        result = ca_common.generate_cmd(sub_cmd=sub_cmd, args=args, cluster='foo', user='client.foo', container_image=image)  # noqa: E501
+        result = ca_common.generate_ceph_cmd(sub_cmd, args, cluster='foo', user='client.foo', container_image=image)
         assert result == expected_cmd
 
     @pytest.mark.parametrize('image', [None, fake_container_image])
     @patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': fake_container_binary})
-    def test_generate_cmd_different_user(self, image):
+    def test_generate_ceph_cmd_different_user(self, image):
         sub_cmd = ['osd', 'pool']
         args = ['create', 'foo']
         if image:
@@ -126,7 +126,7 @@ class TestCommon(object):
             'osd', 'pool',
             'create', 'foo'
         ])
-        result = ca_common.generate_cmd(sub_cmd=sub_cmd, args=args, user='client.foo', container_image=image)  # noqa: E501
+        result = ca_common.generate_ceph_cmd(sub_cmd, args, user='client.foo', container_image=image)
         assert result == expected_cmd
 
     @pytest.mark.parametrize('stdin', [None, 'foo'])
@@ -137,7 +137,7 @@ class TestCommon(object):
         stdout = 'ceph version 1.2.3'
         fake_module.run_command.return_value = 0, stdout, stderr
         expected_cmd = [self.fake_binary, '--version']
-        _rc, _cmd, _out, _err = ca_common.exec_command(fake_module, expected_cmd, stdin=stdin)  # noqa: E501
+        _rc, _cmd, _out, _err = ca_common.exec_command(fake_module, expected_cmd, stdin=stdin)
         assert _rc == rc
         assert _cmd == expected_cmd
         assert _err == stderr