]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Revert "library: flake8 ceph-ansible modules"
authorTeoman ONAY <tonay@ibm.com>
Wed, 18 Jan 2023 21:45:32 +0000 (22:45 +0100)
committerGuillaume Abrioux <gabrioux@ibm.com>
Tue, 14 Feb 2023 09:52:14 +0000 (10:52 +0100)
This reverts commit 35264b7381d5fe66d459ae2cacf20d61f4959c89.

Signed-off-by: Teoman ONAY <tonay@ibm.com>
22 files changed:
library/ceph_add_users_buckets.py
library/ceph_crush.py
library/ceph_crush_rule.py
library/ceph_dashboard_user.py
library/ceph_ec_profile.py
library/ceph_fs.py
library/ceph_key.py
library/ceph_mgr_module.py
library/ceph_osd.py
library/ceph_osd_flag.py
library/ceph_pool.py
library/ceph_volume.py
library/cephadm_adopt.py
library/cephadm_bootstrap.py
library/igw_client.py
library/igw_gateway.py
library/igw_lun.py
library/igw_purge.py
library/radosgw_realm.py
library/radosgw_user.py
library/radosgw_zone.py
library/radosgw_zonegroup.py

index d00b1629f04369d8049b9c3cc7571bc6f87c7b7a..73f3afa450d4056da53065767a4ab5c392fa0557 100644 (file)
@@ -112,7 +112,7 @@ option:
                 default: unlimited
             bucketmaxobjects:
                 description:
-                    - with bucket quota enabled specify maximum number of objects  # noqa: E501
+                    - with bucket quota enabled specify maximum number of objects  # noqa E501
                 required: false
                 default: unlimited
     buckets:
@@ -263,7 +263,7 @@ error_messages:
     returned: always
     type: list
     sample: [
-            "test2: could not modify user: unable to modify user, cannot add duplicate email\n"  # noqa: E501
+            "test2: could not modify user: unable to modify user, cannot add duplicate email\n"  # noqa E501
         ]
 
 failed_users:
@@ -334,36 +334,36 @@ def create_users(rgw, users, result):
             if email:
                 if autogenkey:
                     try:
-                        rgw.create_user(username, fullname, email=email, key_type='s3',  # noqa: E501
+                        rgw.create_user(username, fullname, email=email, key_type='s3',  # noqa E501
                                         generate_key=autogenkey,
-                                        max_buckets=maxbucket, suspended=suspend)  # noqa: E501
+                                        max_buckets=maxbucket, suspended=suspend)  # noqa E501
                     except radosgw.exception.RadosGWAdminError as e:
-                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                         fail_flag = True
                 else:
                     try:
-                        rgw.create_user(username, fullname, email=email, key_type='s3',  # noqa: E501
-                                        access_key=accesskey, secret_key=secretkey,  # noqa: E501
-                                        max_buckets=maxbucket, suspended=suspend)  # noqa: E501
+                        rgw.create_user(username, fullname, email=email, key_type='s3',  # noqa E501
+                                        access_key=accesskey, secret_key=secretkey,  # noqa E501
+                                        max_buckets=maxbucket, suspended=suspend)  # noqa E501
                     except radosgw.exception.RadosGWAdminError as e:
-                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                         fail_flag = True
             else:
                 if autogenkey:
                     try:
                         rgw.create_user(username, fullname, key_type='s3',
                                         generate_key=autogenkey,
-                                        max_buckets=maxbucket, suspended=suspend)  # noqa: E501
+                                        max_buckets=maxbucket, suspended=suspend)  # noqa E501
                     except radosgw.exception.RadosGWAdminError as e:
-                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                         fail_flag = True
                 else:
                     try:
                         rgw.create_user(username, fullname, key_type='s3',
-                                        access_key=accesskey, secret_key=secretkey,  # noqa: E501
-                                        max_buckets=maxbucket, suspended=suspend)  # noqa: E501
+                                        access_key=accesskey, secret_key=secretkey,  # noqa E501
+                                        max_buckets=maxbucket, suspended=suspend)  # noqa E501
                     except radosgw.exception.RadosGWAdminError as e:
-                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                        result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                         fail_flag = True
 
             if not fail_flag and userquota:
@@ -371,15 +371,15 @@ def create_users(rgw, users, result):
                     rgw.set_quota(username, 'user', max_objects=usermaxobjects,
                                   max_size_kb=usermaxsize, enabled=True)
                 except radosgw.exception.RadosGWAdminError as e:
-                    result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                    result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                     fail_flag = True
 
             if not fail_flag and bucketquota:
                 try:
-                    rgw.set_quota(username, 'bucket', max_objects=bucketmaxobjects,  # noqa: E501
+                    rgw.set_quota(username, 'bucket', max_objects=bucketmaxobjects,  # noqa E501
                                   max_size_kb=bucketmaxsize, enabled=True)
                 except radosgw.exception.RadosGWAdminError as e:
-                    result['error_messages'].append(username + ' ' + e.get_code())  # noqa: E501
+                    result['error_messages'].append(username + ' ' + e.get_code())  # noqa E501
                     fail_flag = True
 
             if fail_flag:
@@ -450,12 +450,12 @@ def create_buckets(rgw, buckets, result):
                     except radosgw.exception.RadosGWAdminError:
                         pass
                     failed_buckets.append(bucket)
-                    result['error_messages'].append(bucket + ' could not be linked' + ', NoSuchUser ' + user)  # noqa: E501
+                    result['error_messages'].append(bucket + ' could not be linked' + ', NoSuchUser ' + user)  # noqa E501
 
             else:
                 # something went wrong
                 failed_buckets.append(bucket)
-                result['error_messages'].append(bucket + ' could not be created')  # noqa: E501
+                result['error_messages'].append(bucket + ' could not be created')  # noqa E501
 
         result['added_buckets'] = ", ".join(added_buckets)
         result['failed_buckets'] = ", ".join(failed_buckets)
@@ -467,7 +467,7 @@ def create_bucket(rgw, bucket):
                            host=rgw._connection[0],
                            port=rgw.port,
                            is_secure=rgw.is_secure,
-                           calling_format=boto.s3.connection.OrdinaryCallingFormat(),  # noqa: E501
+                           calling_format=boto.s3.connection.OrdinaryCallingFormat(),  # noqa E501
                            )
 
     try:
@@ -489,23 +489,23 @@ def main():
                   admin_access_key=dict(type='str', required=True),
                   admin_secret_key=dict(type='str', required=True),
                   buckets=dict(type='list', required=False, elements='dict',
-                               options=dict(bucket=dict(type='str', required=True),  # noqa: E501
-                                            user=dict(type='str', required=True))),  # noqa: E501
+                               options=dict(bucket=dict(type='str', required=True),  # noqa E501
+                                            user=dict(type='str', required=True))),  # noqa E501
                   users=dict(type='list', required=False, elements='dict',
-                             options=dict(username=dict(type='str', required=True),  # noqa: E501
-                                          fullname=dict(type='str', required=True),  # noqa: E501
-                                          email=dict(type='str', required=False),  # noqa: E501
-                                          maxbucket=dict(type='int', required=False, default=1000),  # noqa: E501
-                                          suspend=dict(type='bool', required=False, default=False),  # noqa: E501
-                                          autogenkey=dict(type='bool', required=False, default=True),  # noqa: E501
-                                          accesskey=dict(type='str', required=False),  # noqa: E501
-                                          secretkey=dict(type='str', required=False),  # noqa: E501
-                                          userquota=dict(type='bool', required=False, default=False),  # noqa: E501
-                                          usermaxsize=dict(type='str', required=False, default='-1'),  # noqa: E501
-                                          usermaxobjects=dict(type='int', required=False, default=-1),  # noqa: E501
-                                          bucketquota=dict(type='bool', required=False, default=False),  # noqa: E501
-                                          bucketmaxsize=dict(type='str', required=False, default='-1'),  # noqa: E501
-                                          bucketmaxobjects=dict(type='int', required=False, default=-1))))  # noqa: E501
+                             options=dict(username=dict(type='str', required=True),  # noqa E501
+                                          fullname=dict(type='str', required=True),  # noqa E501
+                                          email=dict(type='str', required=False),  # noqa E501
+                                          maxbucket=dict(type='int', required=False, default=1000),  # noqa E501
+                                          suspend=dict(type='bool', required=False, default=False),  # noqa E501
+                                          autogenkey=dict(type='bool', required=False, default=True),  # noqa E501
+                                          accesskey=dict(type='str', required=False),  # noqa E501
+                                          secretkey=dict(type='str', required=False),  # noqa E501
+                                          userquota=dict(type='bool', required=False, default=False),  # noqa E501
+                                          usermaxsize=dict(type='str', required=False, default='-1'),  # noqa E501
+                                          usermaxobjects=dict(type='int', required=False, default=-1),  # noqa E501
+                                          bucketquota=dict(type='bool', required=False, default=False),  # noqa E501
+                                          bucketmaxsize=dict(type='str', required=False, default='-1'),  # noqa E501
+                                          bucketmaxobjects=dict(type='int', required=False, default=-1))))  # noqa E501
 
     # the AnsibleModule object
     module = AnsibleModule(argument_spec=fields,
@@ -533,8 +533,8 @@ def main():
     # radosgw connection
     rgw = radosgw.connection.RadosGWAdminConnection(host=rgw_host,
                                                     port=port,
-                                                    access_key=admin_access_key,  # noqa: E501
-                                                    secret_key=admin_secret_key,  # noqa: E501
+                                                    access_key=admin_access_key,  # noqa E501
+                                                    secret_key=admin_secret_key,  # noqa E501
                                                     aws_signature='AWS4',
                                                     is_secure=is_secure)
 
index f8d63caa7af319b52caabfb8d4138869315297c3..7cb9688be23f44c7cc8671022c381965ee13a1e1 100644 (file)
@@ -108,9 +108,9 @@ def sort_osd_crush_location(location, module):
             "region",
             "root",
         ]
-        return sorted(location, key=lambda crush: crush_bucket_types.index(crush[0]))  # noqa: E501
+        return sorted(location, key=lambda crush: crush_bucket_types.index(crush[0]))  # noqa E501
     except ValueError as error:
-        fatal("{} is not a valid CRUSH bucket, valid bucket types are {}".format(error.args[0].split()[0], crush_bucket_types), module)  # noqa: E501
+        fatal("{} is not a valid CRUSH bucket, valid bucket types are {}".format(error.args[0].split()[0], crush_bucket_types), module)  # noqa E501
 
 
 def create_and_move_buckets_list(cluster, location, containerized=None):
@@ -122,10 +122,10 @@ def create_and_move_buckets_list(cluster, location, containerized=None):
     for item in location:
         bucket_type, bucket_name = item
         # ceph osd crush add-bucket maroot root
-        cmd_list.append(generate_cmd(cluster, "add-bucket", bucket_name, bucket_type, containerized))  # noqa: E501
+        cmd_list.append(generate_cmd(cluster, "add-bucket", bucket_name, bucket_type, containerized))  # noqa E501
         if previous_bucket:
             # ceph osd crush move monrack root=maroot
-            cmd_list.append(generate_cmd(cluster, "move", previous_bucket, "%s=%s" % (bucket_type, bucket_name), containerized))  # noqa: E501
+            cmd_list.append(generate_cmd(cluster, "move", previous_bucket, "%s=%s" % (bucket_type, bucket_name), containerized))  # noqa E501
         previous_bucket = item[1]
     return cmd_list
 
@@ -172,7 +172,7 @@ def run_module():
     startd = datetime.datetime.now()
 
     # run the Ceph command to add buckets
-    rc, cmd, out, err = exec_commands(module, create_and_move_buckets_list(cluster, location, containerized))  # noqa: E501
+    rc, cmd, out, err = exec_commands(module, create_and_move_buckets_list(cluster, location, containerized))  # noqa E501
 
     endd = datetime.datetime.now()
     delta = endd - startd
index 87d4f1e2d73f417304091cecf61d3eb2e16773f8..51940c697f3f66a4baf89db5dc13b764a7d2ffcf 100644 (file)
@@ -17,15 +17,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exit_module, \
-                                               generate_ceph_cmd, \
-                                               is_containerized, \
-                                               exec_command
+    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized, exec_command
 except ImportError:
-    from module_utils.ca_common import exit_module, \
-                                       generate_ceph_cmd, \
-                                       is_containerized, \
-                                       exec_command
+    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized, exec_command
 import datetime
 import json
 
@@ -77,8 +71,7 @@ options:
         description:
             - The ceph bucket type for replicated rule.
         required: false
-        choices: ['osd', 'host', 'chassis', 'rack', 'row', 'pdu', 'pod',
-                 'room', 'datacenter', 'zone', 'region', 'root']
+        choices: ['osd', 'host', 'chassis', 'rack', 'row', 'pdu', 'pod', 'room', 'datacenter', 'zone', 'region', 'root']
     device_class:
         description:
             - The ceph device class for replicated rule.
@@ -142,10 +135,7 @@ def create_rule(module, container_image=None):
         if profile:
             args.append(profile)
 
-    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
-                            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 +150,7 @@ def get_rule(module, container_image=None):
 
     args = ['dump', name, '--format=json']
 
-    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
-                            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 +165,7 @@ def remove_rule(module, container_image=None):
 
     args = ['rm', name]
 
-    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'],
-                            args,
-                            cluster=cluster,
-                            container_image=container_image)
+    cmd = generate_ceph_cmd(['osd', 'crush', 'rule'], args, cluster=cluster, container_image=container_image)
 
     return cmd
 
@@ -191,11 +175,11 @@ def main():
         argument_spec=dict(
             name=dict(type='str', required=True),
             cluster=dict(type='str', required=False, default='ceph'),
-            state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
-            rule_type=dict(type='str', required=False, choices=['replicated', 'erasure']),  # noqa: E501
+            state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
+            rule_type=dict(type='str', required=False, choices=['replicated', 'erasure']),
             bucket_root=dict(type='str', required=False),
-            bucket_type=dict(type='str', required=False, choices=['osd', 'host', 'chassis', 'rack', 'row', 'pdu', 'pod',  # noqa: E501
-                                                                  'room', 'datacenter', 'zone', 'region', 'root']),  # noqa: E501
+            bucket_type=dict(type='str', required=False, choices=['osd', 'host', 'chassis', 'rack', 'row', 'pdu', 'pod',
+                                                                  'room', 'datacenter', 'zone', 'region', 'root']),
             device_class=dict(type='str', required=False),
             profile=dict(type='str', required=False)
         ),
@@ -230,28 +214,28 @@ def main():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))
         if rc != 0:
-            rc, cmd, out, err = exec_command(module, create_rule(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_command(module, create_rule(module, container_image=container_image))
             changed = True
         else:
             rule = json.loads(out)
-            if (rule['type'] == 1 and rule_type == 'erasure') or (rule['type'] == 3 and rule_type == 'replicated'):  # noqa: E501
-                module.fail_json(msg="Can not convert crush rule {} to {}".format(name, rule_type), changed=False, rc=1)  # noqa: E501
+            if (rule['type'] == 1 and rule_type == 'erasure') or (rule['type'] == 3 and rule_type == 'replicated'):
+                module.fail_json(msg="Can not convert crush rule {} to {}".format(name, rule_type), changed=False, rc=1)
 
     elif state == "absent":
-        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_command(module, remove_rule(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_command(module, remove_rule(module, container_image=container_image))
             changed = True
         else:
             rc = 0
             out = "Crush Rule {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_rule(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 if __name__ == '__main__':
index 2183926c6270a04dba733438fdbed83a6f722bca..3d68ec643e757a2bd1f1ded064a3ac9d2ba4aec7 100644 (file)
@@ -22,7 +22,7 @@ try:
                                                exec_command, \
                                                exit_module
 except ImportError:
-    from module_utils.ca_common import generate_ceph_cmd, is_containerized, exec_command, exit_module  # noqa: E501
+    from module_utils.ca_common import generate_ceph_cmd, is_containerized, exec_command, exit_module
 
 import datetime
 import json
@@ -122,11 +122,7 @@ def create_user(module, container_image=None):
 
     args = ['ac-user-create', '-i', '-',  name]
 
-    cmd = generate_ceph_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
 
@@ -144,10 +140,7 @@ def set_roles(module, container_image=None):
 
     args.extend(roles)
 
-    cmd = generate_ceph_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
 
@@ -162,11 +155,7 @@ def set_password(module, container_image=None):
 
     args = ['ac-user-set-password', '-i', '-', name]
 
-    cmd = generate_ceph_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
 
@@ -181,10 +170,7 @@ def get_user(module, container_image=None):
 
     args = ['ac-user-show', name, '--format=json']
 
-    cmd = generate_ceph_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
 
@@ -199,10 +185,7 @@ def remove_user(module, container_image=None):
 
     args = ['ac-user-delete', name]
 
-    cmd = generate_ceph_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
 
@@ -211,11 +194,11 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         password=dict(type='str', required=False, no_log=True),
         roles=dict(type='list',
                    required=False,
-                   choices=['administrator', 'read-only', 'block-manager', 'rgw-manager', 'cluster-manager', 'pool-manager', 'cephfs-manager'],  # noqa: E501
+                   choices=['administrator', 'read-only', 'block-manager', 'rgw-manager', 'cluster-manager', 'pool-manager', 'cephfs-manager'],
                    default=[]),
     )
 
@@ -249,33 +232,33 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))
         if rc == 0:
             user = json.loads(out)
             user['roles'].sort()
             roles.sort()
             if user['roles'] != roles:
-                rc, cmd, out, err = exec_command(module, set_roles(module, container_image=container_image))  # noqa: E501
+                rc, cmd, out, err = exec_command(module, set_roles(module, container_image=container_image))
                 changed = True
-            rc, cmd, out, err = exec_command(module, set_password(module, container_image=container_image), stdin=password)  # noqa: E501
+            rc, cmd, out, err = exec_command(module, set_password(module, container_image=container_image), stdin=password)
         else:
-            rc, cmd, out, err = exec_command(module, create_user(module, container_image=container_image), stdin=password)  # noqa: E501
-            rc, cmd, out, err = exec_command(module, set_roles(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_command(module, create_user(module, container_image=container_image), stdin=password)
+            rc, cmd, out, err = exec_command(module, set_roles(module, container_image=container_image))
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_command(module, remove_user(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_command(module, remove_user(module, container_image=container_image))
             changed = True
         else:
             rc = 0
             out = "Dashboard User {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_user(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 183d2c5d0ec83d7efbf9bdf8896b6bc3054f3a44..a9e84099b7ce7db75c3cd7b981a4383e4258aed9 100644 (file)
@@ -121,7 +121,7 @@ def get_profile(module, name, cluster='ceph', container_image=None):
     return cmd
 
 
-def create_profile(module, name, k, m, stripe_unit, cluster='ceph', force=False, container_image=None):  # noqa: E501
+def create_profile(module, name, k, m, stripe_unit, cluster='ceph', force=False, container_image=None):
     '''
     Create a profile
     '''
@@ -198,10 +198,9 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_command(module, get_profile(module, name, cluster, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_profile(module, name, cluster, container_image=container_image))
         if rc == 0:
-            # the profile already exists, let's check whether we have to
-            # update it
+            # the profile already exists, let's check whether we have to update it
             current_profile = json.loads(out)
             if current_profile['k'] != k or \
                current_profile['m'] != m or \
@@ -213,7 +212,7 @@ def run_module():
                                                                 m,
                                                                 stripe_unit,
                                                                 cluster,
-                                                                force=True, container_image=container_image))  # noqa: E501
+                                                                force=True, container_image=container_image))
                 changed = True
         else:
             # the profile doesn't exist, it has to be created
@@ -221,14 +220,14 @@ def run_module():
                                                                     name,
                                                                     k,
                                                                     m,
-                                                                    stripe_unit,  # noqa: E501
+                                                                    stripe_unit,
                                                                     cluster,
-                                                                    container_image=container_image))  # noqa: E501
+                                                                    container_image=container_image))
             if rc == 0:
                 changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_command(module, delete_profile(module, name, cluster, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, delete_profile(module, name, cluster, container_image=container_image))
         if not err:
             out = 'Profile {} removed.'.format(name)
             changed = True
@@ -236,7 +235,7 @@ def run_module():
             rc = 0
             out = "Skipping, the profile {} doesn't exist".format(name)
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 1be8881dc1a4747fd546cc6d8be38e75264c60d5..4c972c635b409b4875d4f468ca7608b7e3361177 100644 (file)
@@ -119,10 +119,7 @@ def create_fs(module, container_image=None):
 
     args = ['new', name, metadata, data]
 
-    cmd = generate_ceph_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 +134,7 @@ def get_fs(module, container_image=None):
 
     args = ['get', name, '--format=json']
 
-    cmd = generate_ceph_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 +149,7 @@ def remove_fs(module, container_image=None):
 
     args = ['rm', name, '--yes-i-really-mean-it']
 
-    cmd = generate_ceph_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 +164,7 @@ def fail_fs(module, container_image=None):
 
     args = ['fail', name]
 
-    cmd = generate_ceph_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 +180,7 @@ def set_fs(module, container_image=None):
 
     args = ['set', name, 'max_mds', str(max_mds)]
 
-    cmd = generate_ceph_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
 
@@ -204,7 +189,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         data=dict(type='str', required=False),
         metadata=dict(type='str', required=False),
         max_mds=dict(type='int', required=False),
@@ -239,25 +224,25 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))
         if rc == 0:
             fs = json.loads(out)
             if max_mds and fs["mdsmap"]["max_mds"] != max_mds:
-                rc, cmd, out, err = exec_command(module, set_fs(module, container_image=container_image))  # noqa: E501
+                rc, cmd, out, err = exec_command(module, set_fs(module, container_image=container_image))
                 if rc == 0:
                     changed = True
         else:
-            rc, cmd, out, err = exec_command(module, create_fs(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_command(module, create_fs(module, container_image=container_image))
             if max_mds and max_mds > 1:
-                exec_command(module, set_fs(module, container_image=container_image))  # noqa: E501
+                exec_command(module, set_fs(module, container_image=container_image))
             if rc == 0:
                 changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))
         if rc == 0:
-            exec_command(module, fail_fs(module, container_image=container_image))  # noqa: E501
-            rc, cmd, out, err = exec_command(module, remove_fs(module, container_image=container_image))  # noqa: E501
+            exec_command(module, fail_fs(module, container_image=container_image))
+            rc, cmd, out, err = exec_command(module, remove_fs(module, container_image=container_image))
             if rc == 0:
                 changed = True
         else:
@@ -265,9 +250,9 @@ def run_module():
             out = "Ceph File System {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_command(module, get_fs(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 382d4f1f8e29a390048f25ae3a52e78001092872..7325dc33b167dca22753067144182d64e2a7acf9 100644 (file)
@@ -113,7 +113,7 @@ options:
         description:
             - Fetch client.admin and bootstrap key.
             This is only needed for Nautilus and above.
-            Writes down to the filesystem the initial keys generated by the monitor.  # noqa: E501
+            Writes down to the filesystem the initial keys generated by the monitor.  # noqa E501
             This command can ONLY run from a monitor node.
         required: false
         default: false
@@ -128,8 +128,8 @@ options:
 EXAMPLES = '''
 
 keys_to_create:
-  - { name: client.key, key: "AQAin8tUUK84ExAA/QgBtI7gEMWdmnvKBzlXdQ==", caps: { mon: "allow rwx", mds: "allow *" } , mode: "0600" }  # noqa: E501
-  - { name: client.cle, caps: { mon: "allow r", osd: "allow *" } , mode: "0600" }  # noqa: E501
+  - { name: client.key, key: "AQAin8tUUK84ExAA/QgBtI7gEMWdmnvKBzlXdQ==", caps: { mon: "allow rwx", mds: "allow *" } , mode: "0600" } # noqa e501
+  - { name: client.cle, caps: { mon: "allow r", osd: "allow *" } , mode: "0600" } # noqa e501
 
 caps:
   mon: "allow rwx"
@@ -202,8 +202,8 @@ caps:
 RETURN = '''#  '''
 
 
-CEPH_INITIAL_KEYS = ['client.admin', 'client.bootstrap-mds', 'client.bootstrap-mgr',  # noqa: E501
-                     'client.bootstrap-osd', 'client.bootstrap-rbd', 'client.bootstrap-rbd-mirror', 'client.bootstrap-rgw']  # noqa: E501
+CEPH_INITIAL_KEYS = ['client.admin', 'client.bootstrap-mds', 'client.bootstrap-mgr',  # noqa E501
+                     'client.bootstrap-osd', 'client.bootstrap-rbd', 'client.bootstrap-rbd-mirror', 'client.bootstrap-rgw']  # noqa E501
 
 
 def str_to_bool(val):
@@ -278,7 +278,7 @@ def generate_ceph_cmd(cluster, args, user, user_key_path, container_image=None):
     return cmd
 
 
-def generate_ceph_authtool_cmd(cluster, name, secret, caps, dest, container_image=None):  # noqa: E501
+def generate_ceph_authtool_cmd(cluster, name, secret, caps, dest, container_image=None):  # noqa E501
     '''
     Generate 'ceph-authtool' command line to execute
     '''
@@ -306,7 +306,7 @@ def generate_ceph_authtool_cmd(cluster, name, secret, caps, dest, container_imag
     return cmd
 
 
-def create_key(module, result, cluster, user, user_key_path, name, secret, caps, import_key, dest, container_image=None):  # noqa: E501
+def create_key(module, result, cluster, user, user_key_path, name, secret, caps, import_key, dest, container_image=None):  # noqa E501
     '''
     Create a CephX key
     '''
@@ -370,7 +370,7 @@ def get_key(cluster, user, user_key_path, name, dest, container_image=None):
     return cmd_list
 
 
-def info_key(cluster, name, user, user_key_path, output_format, container_image=None):  # noqa: E501
+def info_key(cluster, name, user, user_key_path, output_format, container_image=None):  # noqa E501
     '''
     Get information about a CephX key
     '''
@@ -431,7 +431,7 @@ def lookup_ceph_initial_entities(module, out):
     try:
         out_dict = json.loads(out)
     except ValueError as e:
-        fatal("Could not decode 'ceph auth list' json output: {}".format(e), module)  # noqa: E501
+        fatal("Could not decode 'ceph auth list' json output: {}".format(e), module)  # noqa E501
 
     entities = []
     if "auth_dump" in out_dict:
@@ -441,16 +441,16 @@ def lookup_ceph_initial_entities(module, out):
                     if v in CEPH_INITIAL_KEYS:
                         entities.append(v)
     else:
-        fatal("'auth_dump' key not present in json output:", module)  # noqa: E501
+        fatal("'auth_dump' key not present in json output:", module)  # noqa E501
 
-    if len(entities) != len(CEPH_INITIAL_KEYS) and not str_to_bool(os.environ.get('CEPH_ROLLING_UPDATE', False)):  # noqa: E501
+    if len(entities) != len(CEPH_INITIAL_KEYS) and not str_to_bool(os.environ.get('CEPH_ROLLING_UPDATE', False)):  # noqa E501
         # must be missing in auth_dump, as if it were in CEPH_INITIAL_KEYS
         # it'd be in entities from the above test. Report what's missing.
         missing = []
         for e in CEPH_INITIAL_KEYS:
             if e not in entities:
                 missing.append(e)
-        fatal("initial keyring does not contain keys: " + ' '.join(missing), module)  # noqa: E501
+        fatal("initial keyring does not contain keys: " + ' '.join(missing), module)  # noqa E501
     return entities
 
 
@@ -481,15 +481,15 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=False),
-        state=dict(type='str', required=False, default='present', choices=['present', 'update', 'absent',  # noqa: E501
-                                                                           'list', 'info', 'fetch_initial_keys', 'generate_secret']),  # noqa: E501
+        state=dict(type='str', required=False, default='present', choices=['present', 'update', 'absent',
+                                                                           'list', 'info', 'fetch_initial_keys', 'generate_secret']),
         caps=dict(type='dict', required=False, default=None),
         secret=dict(type='str', required=False, default=None, no_log=True),
         import_key=dict(type='bool', required=False, default=True),
         dest=dict(type='str', required=False, default='/etc/ceph/'),
         user=dict(type='str', required=False, default='client.admin'),
         user_key=dict(type='str', required=False, default=None),
-        output_format=dict(type='str', required=False, default='json', choices=['json', 'plain', 'xml', 'yaml'])  # noqa: E501
+        output_format=dict(type='str', required=False, default='json', choices=['json', 'plain', 'xml', 'yaml'])
     )
 
     module = AnsibleModule(
@@ -565,12 +565,12 @@ def run_module():
         if import_key:
             _info_key = []
             rc, cmd, out, err = exec_commands(
-                module, info_key(cluster, name, user, user_key_path, output_format, container_image))  # noqa: E501
+                module, info_key(cluster, name, user, user_key_path, output_format, container_image))  # noqa E501
             key_exist = rc
             if not caps and key_exist != 0:
-                fatal("Capabilities must be provided when state is 'present'", module)  # noqa: E501
+                fatal("Capabilities must be provided when state is 'present'", module)  # noqa E501
             if key_exist != 0 and secret is None and caps is None:
-                fatal("Keyring doesn't exist, you must provide 'secret' and 'caps'", module)  # noqa: E501
+                fatal("Keyring doesn't exist, you must provide 'secret' and 'caps'", module)  # noqa E501
             if key_exist == 0:
                 _info_key = json.loads(out)
                 if not secret:
@@ -581,25 +581,25 @@ def run_module():
                 _caps = _info_key[0]['caps']
                 if secret == _secret and caps == _caps:
                     if not os.path.isfile(file_path):
-                        rc, cmd, out, err = exec_commands(module, get_key(cluster, user, user_key_path, name, file_path, container_image))  # noqa: E501
+                        rc, cmd, out, err = exec_commands(module, get_key(cluster, user, user_key_path, name, file_path, container_image))  # noqa E501
                         result["rc"] = rc
                         if rc != 0:
-                            result["stdout"] = "Couldn't fetch the key {0} at {1}.".format(name, file_path)  # noqa: E501
+                            result["stdout"] = "Couldn't fetch the key {0} at {1}.".format(name, file_path) # noqa E501
                             module.exit_json(**result)
-                        result["stdout"] = "fetched the key {0} at {1}.".format(name, file_path)  # noqa: E501
+                        result["stdout"] = "fetched the key {0} at {1}.".format(name, file_path) # noqa E501
 
-                    result["stdout"] = "{0} already exists and doesn't need to be updated.".format(name)  # noqa: E501
+                    result["stdout"] = "{0} already exists and doesn't need to be updated.".format(name) # noqa E501
                     result["rc"] = 0
                     module.set_fs_attributes_if_different(file_args, False)
                     module.exit_json(**result)
         else:
             if os.path.isfile(file_path) and not secret or not caps:
-                result["stdout"] = "{0} already exists in {1} you must provide secret *and* caps when import_key is {2}".format(name, dest, import_key)  # noqa: E501
+                result["stdout"] = "{0} already exists in {1} you must provide secret *and* caps when import_key is {2}".format(name, dest, import_key) # noqa E501
                 result["rc"] = 0
                 module.exit_json(**result)
-        if (key_exist == 0 and (secret != _secret or caps != _caps)) or key_exist != 0:  # noqa: E501
+        if (key_exist == 0 and (secret != _secret or caps != _caps)) or key_exist != 0:  # noqa E501
             rc, cmd, out, err = exec_commands(module, create_key(
-                module, result, cluster, user, user_key_path, name, secret, caps, import_key, file_path, container_image))  # noqa: E501
+                module, result, cluster, user, user_key_path, name, secret, caps, import_key, file_path, container_image))  # noqa E501
             if rc != 0:
                 result["stdout"] = "Couldn't create or update {0}".format(name)
                 result["stderr"] = err
@@ -610,7 +610,7 @@ def run_module():
     elif state == "absent":
         if key_exist == 0:
             rc, cmd, out, err = exec_commands(
-                module, delete_key(cluster, user, user_key_path, name, container_image))  # noqa: E501
+                module, delete_key(cluster, user, user_key_path, name, container_image))
             if rc == 0:
                 changed = True
         else:
@@ -618,7 +618,7 @@ def run_module():
 
     elif state == "info":
         rc, cmd, out, err = exec_commands(
-            module, info_key(cluster, name, user, user_key_path, output_format, container_image))  # noqa: E501
+            module, info_key(cluster, name, user, user_key_path, output_format, container_image))  # noqa E501
 
     elif state == "list":
         rc, cmd, out, err = exec_commands(
@@ -659,7 +659,7 @@ def run_module():
             # we use info_cmd[0] because info_cmd is an array made of an array
             info_cmd[0].extend(extra_args)
             rc, cmd, out, err = exec_commands(
-                module, info_cmd)  # noqa: E501
+                module, info_cmd)  # noqa E501
 
             file_args = module.load_file_common_arguments(module.params)
             file_args['path'] = key_path
index 1971159d3f912c379e48b187e318b814307b9418..54095a0c39d166ad37d3023bd0b2fa4116e106b7 100644 (file)
@@ -17,13 +17,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exit_module, \
-                                               generate_ceph_cmd, \
-                                               is_containerized
+    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 except ImportError:
-    from module_utils.ca_common import exit_module, \
-                                       generate_ceph_cmd, \
-                                       is_containerized
+    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 import datetime
 
 
@@ -84,7 +80,7 @@ def main():
         argument_spec=dict(
             name=dict(type='str', required=True),
             cluster=dict(type='str', required=False, default='ceph'),
-            state=dict(type='str', required=False, default='enable', choices=['enable', 'disable']),  # noqa: E501
+            state=dict(type='str', required=False, default='enable', choices=['enable', 'disable']),
         ),
         supports_check_mode=True,
     )
@@ -97,10 +93,7 @@ def main():
 
     container_image = is_containerized()
 
-    cmd = generate_ceph_cmd(['mgr', 'module'],
-                            [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(
index 63e15010d75626664f91f29e950ccffb3c93908d..a315f5983c9808ccebfbe6067c561c5ef2b6e367 100644 (file)
@@ -17,9 +17,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized  # noqa: E501
+    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 except ImportError:
-    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized  # noqa: E501
+    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 import datetime
 
 
@@ -95,7 +95,7 @@ def main():
         argument_spec=dict(
             ids=dict(type='list', required=True),
             cluster=dict(type='str', required=False, default='ceph'),
-            state=dict(type='str', required=True, choices=['destroy', 'down', 'in', 'out', 'purge', 'rm']),  # noqa: E501
+            state=dict(type='str', required=True, choices=['destroy', 'down', 'in', 'out', 'purge', 'rm']),
         ),
         supports_check_mode=True,
     )
@@ -105,13 +105,13 @@ def main():
     state = module.params.get('state')
 
     if state in ['destroy', 'purge'] and len(ids) > 1:
-        module.fail_json(msg='destroy and purge only support one OSD at at time', rc=1)  # noqa: E501
+        module.fail_json(msg='destroy and purge only support one OSD at at time', rc=1)
 
     startd = datetime.datetime.now()
 
     container_image = is_containerized()
 
-    cmd = generate_ceph_cmd(['osd', state], ids, cluster=cluster, container_image=container_image)  # noqa: E501
+    cmd = generate_ceph_cmd(['osd', state], ids, cluster=cluster, container_image=container_image)
 
     if state in ['destroy', 'purge']:
         cmd.append('--yes-i-really-mean-it')
index 1e6fe961192714f48d401125c13fa9f76c73f5d0..46eb664009038012c8cf2f354cb04c6b5320db29 100644 (file)
@@ -17,13 +17,9 @@ __metaclass__ = type
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exit_module, \
-                                               generate_ceph_cmd, \
-                                               is_containerized
+    from ansible.module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 except ImportError:
-    from module_utils.ca_common import exit_module, \
-                                       generate_ceph_cmd, \
-                                       is_containerized
+    from module_utils.ca_common import exit_module, generate_ceph_cmd, is_containerized
 import datetime
 
 
@@ -45,8 +41,7 @@ options:
         description:
             - name of the ceph OSD flag.
         required: true
-        choices: ['noup', 'nodown', 'noout', 'nobackfill', 'norebalance',
-                 'norecover', 'noscrub', 'nodeep-scrub']
+        choices: ['noup', 'nodown', 'noout', 'nobackfill', 'norebalance', 'norecover', 'noscrub', 'nodeep-scrub']
     cluster:
         description:
             - The ceph cluster name.
@@ -83,9 +78,9 @@ RETURN = '''#  '''
 def main():
     module = AnsibleModule(
         argument_spec=dict(
-            name=dict(type='str', required=True, choices=['noup', 'nodown', 'noout', 'nobackfill', 'norebalance', 'norecover', 'noscrub', 'nodeep-scrub']),  # noqa: E501
+            name=dict(type='str', required=True, choices=['noup', 'nodown', 'noout', 'nobackfill', 'norebalance', 'norecover', 'noscrub', 'nodeep-scrub']),
             cluster=dict(type='str', required=False, default='ceph'),
-            state=dict(type='str', required=False, default='present', choices=['present', 'absent']),  # noqa: E501
+            state=dict(type='str', required=False, default='present', choices=['present', 'absent']),
         ),
         supports_check_mode=True,
     )
@@ -99,9 +94,9 @@ def main():
     container_image = is_containerized()
 
     if state == 'present':
-        cmd = generate_ceph_cmd(['osd', 'set'], [name], cluster=cluster, container_image=container_image)  # noqa: E501
+        cmd = generate_ceph_cmd(['osd', 'set'], [name], cluster=cluster, container_image=container_image)
     else:
-        cmd = generate_ceph_cmd(['osd', 'unset'], [name], cluster=cluster, container_image=container_image)  # noqa: E501
+        cmd = generate_ceph_cmd(['osd', 'unset'], [name], cluster=cluster, container_image=container_image)
 
     if module.check_mode:
         exit_module(
index 417236289c48e4e4886f1c3213aac88f164b9268..6a134d528d27baef97a7c08c8726f8787c39379d 100644 (file)
@@ -298,8 +298,7 @@ def get_pool_details(module,
                                                                           user_key,    # noqa: E501
                                                                           container_image=container_image))  # noqa: E501
 
-    # This is a trick because "target_size_ratio" isn't present at the same
-    # level in the dict
+    # This is a trick because "target_size_ratio" isn't present at the same level in the dict
     # ie:
     # {
     # 'pg_num': 8,
@@ -309,8 +308,8 @@ def get_pool_details(module,
     #          'target_size_ratio': 0.1
     #     }
     # }
-    # If 'target_size_ratio' is present in 'options', we set it, this way we
-    # end up with a dict containing all needed keys at the same level.
+    # If 'target_size_ratio' is present in 'options', we set it, this way we end up
+    # with a dict containing all needed keys at the same level.
     if 'target_size_ratio' in out['options'].keys():
         out['target_size_ratio'] = out['options']['target_size_ratio']
     else:
@@ -335,7 +334,7 @@ def compare_pool_config(user_pool_config, running_pool_details):
     filter_keys = ['pg_num', 'pg_placement_num', 'size',
                    'pg_autoscale_mode', 'target_size_ratio']
     for key in filter_keys:
-        if (str(running_pool_details[key]) != user_pool_config[key]['value'] and  # noqa: E501
+        if (str(running_pool_details[key]) != user_pool_config[key]['value'] and
                 user_pool_config[key]['value']):
             delta[key] = user_pool_config[key]
 
index d5d91c2e421fc1ef114d4be45eabf76a032be8c9..9f00132919e4edcd08403c0a11859d975f647605 100644 (file)
@@ -2,13 +2,9 @@
 
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible.module_utils.ca_common import exec_command, \
-                                               is_containerized, \
-                                               fatal
+    from ansible.module_utils.ca_common import exec_command, is_containerized, fatal
 except ImportError:
-    from module_utils.ca_common import exec_command, \
-                                       is_containerized, \
-                                       fatal
+    from module_utils.ca_common import exec_command, is_containerized, fatal
 import datetime
 import copy
 import json
@@ -83,7 +79,7 @@ options:
         required: false
     db_vg:
         description:
-            - If db is a lv, this must be the name of the volume group it belongs to.  # noqa: E501
+            - If db is a lv, this must be the name of the volume group it belongs to.  # noqa E501
             - Only applicable if objectstore is 'bluestore'.
         required: false
     wal:
@@ -93,7 +89,7 @@ options:
         required: false
     wal_vg:
         description:
-            - If wal is a lv, this must be the name of the volume group it belongs to.  # noqa: E501
+            - If wal is a lv, this must be the name of the volume group it belongs to.  # noqa E501
             - Only applicable if objectstore is 'bluestore'.
         required: false
     crush_device_class:
@@ -183,7 +179,7 @@ EXAMPLES = '''
     action: create
 
 
-- name: set up a bluestore osd with an lv for data and partitions for block.wal and block.db  # noqa: E501
+- name: set up a bluestore osd with an lv for data and partitions for block.wal and block.db  # noqa e501
   ceph_volume:
     objectstore: bluestore
     data: data-lv
@@ -295,7 +291,7 @@ def batch(module, container_image, report=None):
         fatal('osds_per_device must be provided if action is "batch"', module)
 
     if osds_per_device < 1:
-        fatal('osds_per_device must be greater than 0 if action is "batch"', module)  # noqa: E501
+        fatal('osds_per_device must be greater than 0 if action is "batch"', module)  # noqa E501
 
     if not batch_devices:
         fatal('batch_devices must be provided if action is "batch"', module)
@@ -467,7 +463,7 @@ def is_lv(module, vg, lv, container_image):
     Check if an LV exists
     '''
 
-    args = ['--noheadings', '--reportformat', 'json', '--select', 'lv_name={},vg_name={}'.format(lv, vg)]  # noqa: E501
+    args = ['--noheadings', '--reportformat', 'json', '--select', 'lv_name={},vg_name={}'.format(lv, vg)]  # noqa E501
 
     cmd = build_cmd(args, container_image, binary='lvs')
 
@@ -540,7 +536,7 @@ def run_module():
                          'bluestore', 'filestore'], default='bluestore'),
         action=dict(type='str', required=False, choices=[
                     'create', 'zap', 'batch', 'prepare', 'activate', 'list',
-                    'inventory'], default='create'),  # noqa: 4502
+                    'inventory'], default='create'),  # noqa 4502
         data=dict(type='str', required=False),
         data_vg=dict(type='str', required=False),
         journal=dict(type='str', required=False),
@@ -615,11 +611,11 @@ def run_module():
         try:
             out_dict = json.loads(out)
         except ValueError:
-            fatal("Could not decode json output: {} from the command {}".format(out, cmd), module)  # noqa: E501
+            fatal("Could not decode json output: {} from the command {}".format(out, cmd), module)  # noqa E501
 
         if out_dict:
             data = module.params['data']
-            result['stdout'] = 'skipped, since {0} is already used for an osd'.format(data)  # noqa: E501
+            result['stdout'] = 'skipped, since {0} is already used for an osd'.format(data)  # noqa E501
             result['rc'] = 0
             module.exit_json(**result)
 
@@ -630,7 +626,7 @@ def run_module():
     elif action == 'activate':
         if container_image:
             fatal(
-                "This is not how container's activation happens, nothing to activate", module)  # noqa: E501
+                "This is not how container's activation happens, nothing to activate", module)  # noqa E501
 
         # Activate the OSD
         rc, cmd, out, err = exec_command(
@@ -641,16 +637,16 @@ def run_module():
         skip = []
         for device_type in ['journal', 'data', 'db', 'wal']:
             # 1/ if we passed vg/lv
-            if module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None):  # noqa: E501
+            if module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None):  # noqa E501
                 # 2/ check this is an actual lv/vg
-                ret = is_lv(module, module.params['{}_vg'.format(device_type)], module.params[device_type], container_image)  # noqa: E501
+                ret = is_lv(module, module.params['{}_vg'.format(device_type)], module.params[device_type], container_image)  # noqa E501
                 skip.append(ret)
                 # 3/ This isn't a lv/vg device
                 if not ret:
                     module.params['{}_vg'.format(device_type)] = False
                     module.params[device_type] = False
-            # 4/ no journal|data|db|wal|_vg was passed, so it must be a raw device  # noqa: E501
-            elif not module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None):  # noqa: E501
+            # 4/ no journal|data|db|wal|_vg was passed, so it must be a raw device  # noqa E501
+            elif not module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None):  # noqa E501
                 skip.append(True)
 
         cmd = zap_devices(module, container_image)
index 723e0a46ce03b4b9b170b250bb70038ba67f53cb..b7fc89e239896938aa44e0ae71fa7f3e6b81b73e 100644 (file)
@@ -139,7 +139,7 @@ def main():
         rc, out, err = module.run_command(cmd)
 
     if rc == 0:
-        if name in [x["name"] for x in json.loads(out) if x["style"] == "cephadm:v1"]:  # noqa: E501
+        if name in [x["name"] for x in json.loads(out) if x["style"] == "cephadm:v1"]:
             exit_module(
                 module=module,
                 out='{} is already adopted'.format(name),
@@ -160,7 +160,7 @@ def main():
     if image:
         cmd.extend(['--image', image])
 
-    cmd.extend(['adopt', '--cluster', cluster, '--name', name, '--style', style])  # noqa: E501
+    cmd.extend(['adopt', '--cluster', cluster, '--name', name, '--style', style])
 
     if not pull:
         cmd.append('--skip-pull')
index f7d2cbdca5e87513a29f31835b4359884d9a78d4..6150dbd62c050e8b7ee70a84022bec9f4e1bab92 100644 (file)
@@ -100,8 +100,7 @@ options:
         required: false
     registry_json:
         description:
-            - JSON file with custom registry login info (URL,
-              username, password).
+            - JSON file with custom registry login info (URL, username, password).
         required: false
     ssh_user:
         description:
index d4905f69abbed3ebf97ca55b328d6ebde4c36b59..cb60519380e0b635ec103d30a01110a536eb117e 100644 (file)
@@ -53,13 +53,13 @@ author:
 
 """
 
-import os  # noqa: E402
-import logging  # noqa: E402
-from logging.handlers import RotatingFileHandler  # noqa: E402
-from ansible.module_utils.basic import *  # noqa: E402,F403
+import os  # noqa E402
+import logging  # noqa E402
+from logging.handlers import RotatingFileHandler  # noqa E402
+from ansible.module_utils.basic import *  # noqa E402
 
-from ceph_iscsi_config.client import GWClient  # noqa: E402
-import ceph_iscsi_config.settings as settings  # noqa: E402
+from ceph_iscsi_config.client import GWClient  # noqa E402
+import ceph_iscsi_config.settings as settings  # noqa E402
 
 
 # the main function is called ansible_main to allow the call stack
@@ -78,7 +78,7 @@ def ansible_main():
         },
     }
 
-    module = AnsibleModule(argument_spec=fields,    # noqa: F405
+    module = AnsibleModule(argument_spec=fields,    # noqa F405
                            supports_check_mode=False)
 
     client_iqn = module.params['client_iqn']
index 7ad9aa33047a8859ed66a8c0763e0cb18d14d5b3..2f56f425d2f0691b6ce78c363b2ecdf2d1ad4637 100644 (file)
@@ -56,17 +56,17 @@ author:
 
 """
 
-import os  # noqa: E402
-import logging  # noqa: E402
+import os  # noqa E402
+import logging  # noqa E402
 
-from logging.handlers import RotatingFileHandler  # noqa: E402
-from ansible.module_utils.basic import *  # noqa: E402,F403
+from logging.handlers import RotatingFileHandler  # noqa E402
+from ansible.module_utils.basic import *  # noqa E402
 
-import ceph_iscsi_config.settings as settings  # noqa: E402
-from ceph_iscsi_config.common import Config  # noqa: E402
+import ceph_iscsi_config.settings as settings  # noqa E402
+from ceph_iscsi_config.common import Config  # noqa E402
 
-from ceph_iscsi_config.gateway import GWTarget  # noqa: E402
-from ceph_iscsi_config.utils import valid_ip  # noqa: E402
+from ceph_iscsi_config.gateway import GWTarget  # noqa E402
+from ceph_iscsi_config.utils import valid_ip  # noqa E402
 
 
 # the main function is called ansible_main to allow the call stack
@@ -83,7 +83,7 @@ def ansible_main():
     }
     }
 
-    module = AnsibleModule(argument_spec=fields,  # noqa: F405
+    module = AnsibleModule(argument_spec=fields,  # noqa F405
                            supports_check_mode=False)
 
     cfg = Config(logger)
index 8fae72cf2f1510f390d343b2eccb9d1a79047dc4..6b9ba98bd11d16ca061d39bb15ca724a48ef9efd 100644 (file)
@@ -8,11 +8,11 @@ module: igw_lun
 short_description: Manage ceph rbd images to present as iscsi LUNs to clients
 description:
   - This module calls the 'lun' configuration management module installed
-    on the iscsi gateway node(s). The lun module handles the creation and resize  # noqa: E501
+    on the iscsi gateway node(s). The lun module handles the creation and resize  # noqa E501
     of rbd images, and then maps these rbd devices to the gateway node(s) to be
     exposed through the kernel's LIO target.
 
-    To support module debugging, this module logs to /var/log/ansible-module-igw_config.log  # noqa: E501
+    To support module debugging, this module logs to /var/log/ansible-module-igw_config.log  # noqa E501
     on the target machine(s).
 
 option:
@@ -70,15 +70,15 @@ author:
 
 """
 
-import os  # noqa: E402
-import logging  # noqa: E402
-from logging.handlers import RotatingFileHandler  # noqa: E402
+import os  # noqa E402
+import logging  # noqa E402
+from logging.handlers import RotatingFileHandler  # noqa E402
 
-from ansible.module_utils.basic import *  # noqa: E402,F403
+from ansible.module_utils.basic import *  # noqa E402
 
-from ceph_iscsi_config.lun import LUN  # noqa: E402
-from ceph_iscsi_config.utils import valid_size  # noqa: E402
-import ceph_iscsi_config.settings as settings  # noqa: E402
+from ceph_iscsi_config.lun import LUN  # noqa E402
+from ceph_iscsi_config.utils import valid_size  # noqa E402
+import ceph_iscsi_config.settings as settings  # noqa E402
 
 
 # the main function is called ansible_main to allow the call stack
@@ -103,7 +103,7 @@ def ansible_main():
     }
 
     # not supporting check mode currently
-    module = AnsibleModule(argument_spec=fields,  # noqa: F405
+    module = AnsibleModule(argument_spec=fields,  # noqa F405
                            supports_check_mode=False)
 
     pool = module.params["pool"]
index a2a9f8421f35b33d05f8818feb477fa7120afaec..3306395c52775ebc1ddba225afb8a4e4297a3d48 100644 (file)
@@ -34,18 +34,18 @@ author:
 
 """
 
-import os  # noqa: E402
-import logging  # noqa: E402
-import socket  # noqa: E402,F401
-import rados  # noqa: E402
-import rbd  # noqa: E402
+import os  # noqa E402
+import logging  # noqa E402
+import socket  # noqa E402
+import rados  # noqa E402
+import rbd  # noqa E402
 
-from logging.handlers import RotatingFileHandler  # noqa: E402
-from ansible.module_utils.basic import *  # noqa: E402,F403
+from logging.handlers import RotatingFileHandler  # noqa E402
+from ansible.module_utils.basic import *  # noqa E402
 
-import ceph_iscsi_config.settings as settings  # noqa: E402
-from ceph_iscsi_config.common import Config  # noqa: E402
-from ceph_iscsi_config.lun import RBDDev  # noqa: E402
+import ceph_iscsi_config.settings as settings  # noqa E402
+from ceph_iscsi_config.common import Config  # noqa E402
+from ceph_iscsi_config.lun import RBDDev  # noqa E402
 
 __author__ = 'pcuzner@redhat.com'
 
@@ -81,7 +81,7 @@ def delete_images(cfg):
 
         if rbd_dev.error:
             if rbd_dev.error_msg:
-                logger.error("Could not remove {}. Error: {}. Manually run the "  # noqa: E501
+                logger.error("Could not remove {}. Error: {}. Manually run the "  # noqa E501
                              "rbd command line tool to delete.".
                              format(image, rbd_dev.error_msg))
             else:
@@ -117,7 +117,7 @@ def ansible_main():
                        }
               }
 
-    module = AnsibleModule(argument_spec=fields,  # noqa: F405
+    module = AnsibleModule(argument_spec=fields,  # noqa F405
                            supports_check_mode=False)
 
     run_mode = module.params['mode']
index 2823113882b1200a4211efc486c0215b9bf89a02..3150d180385eb37d6d9e0c1c0fb9e4c5aba873a9 100644 (file)
@@ -170,9 +170,7 @@ def create_realm(module, container_image=None):
     if default:
         args.append('--default')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -187,9 +185,7 @@ def get_realm(module, container_image=None):
 
     args = ['get', '--rgw-realm=' + name, '--format=json']
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -204,9 +200,7 @@ def remove_realm(module, container_image=None):
 
     args = ['delete', '--rgw-realm=' + name]
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -232,7 +226,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         default=dict(type='bool', required=False, default=False),
     )
 
@@ -263,24 +257,24 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))
         if rc != 0:
-            rc, cmd, out, err = exec_commands(module, create_realm(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, create_realm(module, container_image=container_image))
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_commands(module, remove_realm(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, remove_realm(module, container_image=container_image))
             changed = True
         else:
             rc = 0
             out = "Realm {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_realm(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 8e26bbb3bb0e62ed9b1558f9252fa4f591996742..7c3e443ddc6db009a900043ddfda3736d2fdee36 100644 (file)
@@ -250,9 +250,7 @@ def create_user(module, container_image=None):
     if admin:
         args.append('--admin')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -303,9 +301,7 @@ def modify_user(module, container_image=None):
     if admin:
         args.append('--admin')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -361,9 +357,7 @@ def remove_user(module, container_image=None):
     if zone:
         args.extend(['--rgw-zone=' + zone])
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -389,7 +383,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         display_name=dict(type='str', required=False),
         email=dict(type='str', required=False),
         access_key=dict(type='str', required=False, no_log=True),
@@ -436,7 +430,7 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))
         if rc == 0:
             user = json.loads(out)
             current = {
@@ -460,25 +454,25 @@ def run_module():
                 asked['secret_key'] = secret_key
 
             if current != asked:
-                rc, cmd, out, err = exec_commands(module, modify_user(module, container_image=container_image))  # noqa: E501
+                rc, cmd, out, err = exec_commands(module, modify_user(module, container_image=container_image))
                 changed = True
         else:
-            rc, cmd, out, err = exec_commands(module, create_user(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, create_user(module, container_image=container_image))
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_commands(module, remove_user(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, remove_user(module, container_image=container_image))
             changed = True
         else:
             rc = 0
             out = "User {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_user(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 51103b3d3691b5ec8638ee2860580866e61f9981..047e1b19404ec79b2c8468b464f9b91a6e22e610 100644 (file)
@@ -231,9 +231,7 @@ def create_zone(module, container_image=None):
     if master:
         args.append('--master')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -275,9 +273,7 @@ def modify_zone(module, container_image=None):
     if master:
         args.append('--master')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -374,9 +370,7 @@ def remove_zone(module, container_image=None):
         '--rgw-zone=' + name
     ]
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -402,7 +396,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         realm=dict(type='str', require=True),
         zonegroup=dict(type='str', require=True),
         endpoints=dict(type='list', require=False, default=[]),
@@ -442,14 +436,14 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))
         if rc == 0:
             zone = json.loads(out)
-            _rc, _cmd, _out, _err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
+            _rc, _cmd, _out, _err = exec_commands(module, get_realm(module, container_image=container_image))
             if _rc != 0:
                 fatal(_err, module)
             realm = json.loads(_out)
-            _rc, _cmd, _out, _err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
+            _rc, _cmd, _out, _err = exec_commands(module, get_zonegroup(module, container_image=container_image))
             if _rc != 0:
                 fatal(_err, module)
             zonegroup = json.loads(_out)
@@ -458,7 +452,7 @@ def run_module():
             if not secret_key:
                 secret_key = ''
             current = {
-                'endpoints': next(zone['endpoints'] for zone in zonegroup['zones'] if zone['name'] == name),  # noqa: E501
+                'endpoints': next(zone['endpoints'] for zone in zonegroup['zones'] if zone['name'] == name),
                 'access_key': zone['system_key']['access_key'],
                 'secret_key': zone['system_key']['secret_key'],
                 'realm_id': zone['realm_id']
@@ -470,25 +464,25 @@ def run_module():
                 'realm_id': realm['id']
             }
             if current != asked:
-                rc, cmd, out, err = exec_commands(module, modify_zone(module, container_image=container_image))  # noqa: E501
+                rc, cmd, out, err = exec_commands(module, modify_zone(module, container_image=container_image))
                 changed = True
         else:
-            rc, cmd, out, err = exec_commands(module, create_zone(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, create_zone(module, container_image=container_image))
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_commands(module, remove_zone(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, remove_zone(module, container_image=container_image))
             changed = True
         else:
             rc = 0
             out = "Zone {} doesn't exist".format(name)
 
     elif state == "info":
-        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_zone(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():
index 42075d45b6d921663731924b0ffbb2fc456a0094..8abf2aef9bbd0540aee98aa30b976e33e124f7f2 100644 (file)
@@ -204,9 +204,7 @@ def create_zonegroup(module, container_image=None):
     if master:
         args.append('--master')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -234,9 +232,7 @@ def modify_zonegroup(module, container_image=None):
     if master:
         args.append('--master')
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -250,12 +246,7 @@ def get_zonegroup(module, container_image=None):
     name = module.params.get('name')
     realm = module.params.get('realm')
 
-    args = [
-        'get',
-        '--rgw-realm=' + realm,
-        '--rgw-zonegroup=' + name,
-        '--format=json'
-    ]
+    args = ['get', '--rgw-realm=' + realm, '--rgw-zonegroup=' + name, '--format=json']
 
     cmd = generate_radosgw_cmd(cluster=cluster,
                                args=args,
@@ -299,9 +290,7 @@ def remove_zonegroup(module, container_image=None):
 
     args = ['delete', '--rgw-realm=' + realm, '--rgw-zonegroup=' + name]
 
-    cmd = generate_radosgw_cmd(cluster=cluster,
-                               args=args,
-                               container_image=container_image)
+    cmd = generate_radosgw_cmd(cluster=cluster, args=args, container_image=container_image)
 
     return cmd
 
@@ -327,7 +316,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),  # noqa: E501
+        state=dict(type='str', required=False, choices=['present', 'absent', 'info'], default='present'),
         realm=dict(type='str', require=True),
         endpoints=dict(type='list', require=False, default=[]),
         default=dict(type='bool', required=False, default=False),
@@ -363,10 +352,10 @@ def run_module():
     container_image = is_containerized()
 
     if state == "present":
-        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))
         if rc == 0:
             zonegroup = json.loads(out)
-            _rc, _cmd, _out, _err = exec_commands(module, get_realm(module, container_image=container_image))  # noqa: E501
+            _rc, _cmd, _out, _err = exec_commands(module, get_realm(module, container_image=container_image))
             if _rc != 0:
                 fatal(_err, module)
             realm = json.loads(_out)
@@ -381,25 +370,25 @@ def run_module():
                 'realm_id': realm['id']
             }
             if current != asked:
-                rc, cmd, out, err = exec_commands(module, modify_zonegroup(module, container_image=container_image))  # noqa: E501
+                rc, cmd, out, err = exec_commands(module, modify_zonegroup(module, container_image=container_image))
                 changed = True
         else:
-            rc, cmd, out, err = exec_commands(module, create_zonegroup(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, create_zonegroup(module, container_image=container_image))
             changed = True
 
     elif state == "absent":
-        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))  # noqa: E501
+        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))
         if rc == 0:
-            rc, cmd, out, err = exec_commands(module, remove_zonegroup(module, container_image=container_image))  # noqa: E501
+            rc, cmd, out, err = exec_commands(module, remove_zonegroup(module, container_image=container_image))
             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
+        rc, cmd, out, err = exec_commands(module, get_zonegroup(module, container_image=container_image))
 
-    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)  # noqa: E501
+    exit_module(module=module, out=out, rc=rc, cmd=cmd, err=err, startd=startd, changed=changed)
 
 
 def main():