Merge "pep8 the ansible modules"

5 files changed, 51 insertions, 45 deletions

diff --git a/docker/kolla-ansible/find_disks.py b/docker/kolla-ansible/find_disks.py
index 7b9324b2c..d5761ceb0 100644
--- a/docker/kolla-ansible/find_disks.py
+++ b/docker/kolla-ansible/find_disks.py
@@ -45,12 +45,12 @@ EXAMPLES = '''
 import json
 import pyudev
 
+
 def main():
-    module = AnsibleModule(
-        argument_spec = dict(
-            partition_name = dict(required=True, type='str')
-        )
+    argument_spec = dict(
+        partition_name=dict(required=True, type='str')
     )
+    module = AnsibleModule(argument_spec)
     partition_name = module.params.get('partition_name')
 
     try:
@@ -68,6 +68,6 @@ def main():
         module.exit_json(failed=True, msg=repr(e))
 
 # import module snippets
-from ansible.module_utils.basic import *
+from ansible.module_utils.basic import *  # noqa
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-ansible/kolla_keystone_service.py b/docker/kolla-ansible/kolla_keystone_service.py
index addd14a92..7c03d00e1 100644
--- a/docker/kolla-ansible/kolla_keystone_service.py
+++ b/docker/kolla-ansible/kolla_keystone_service.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is a barebones file needed to file a gap until Ansible 2.0. No error
-# checking, no deletions, no updates. Idempotent creation only.
+# This file is a barebones file needed to file a gap until Ansible 2.0. No
+# error checking, no deletions, no updates. Idempotent creation only.
 
 # If you look closely, you will see we arent _really_ using the shade module
 # we just use it to slightly abstract the authentication model. As patches land
@@ -24,18 +24,18 @@
 
 import shade
 
+
 def main():
-    module = AnsibleModule(
-        argument_spec = openstack_full_argument_spec(
-            description = dict(required=True, type='str'),
-            service_name = dict(required=True, type='str'),
-            service_type = dict(required=True, type='str'),
-            admin_url = dict(required=True, type='str'),
-            internal_url = dict(required=True, type='str'),
-            public_url = dict(required=True, type='str'),
-            endpoint_region = dict(required=True, type='str')
-        )
+    argument_spec = openstack_full_argument_spec(
+        description=dict(required=True, type='str'),
+        service_name=dict(required=True, type='str'),
+        service_type=dict(required=True, type='str'),
+        admin_url=dict(required=True, type='str'),
+        internal_url=dict(required=True, type='str'),
+        public_url=dict(required=True, type='str'),
+        endpoint_region=dict(required=True, type='str')
     )
+    module = AnsibleModule(argument_spec)
 
     try:
         description = module.params.pop('description')
@@ -61,24 +61,26 @@ def main():
                 if _endpoint.service_id == service.id:
                     endpoint = _endpoint
         else:
-            service = cloud.keystone_client.services.create(name=service_name,
-                                                            service_type=service_type,
-                                                            description=description)
+            service = cloud.keystone_client.services.create(
+                name=service_name,
+                service_type=service_type,
+                description=description)
 
         if endpoint is None:
             changed = True
-            cloud.keystone_client.endpoints.create(service_id=service.id,
-                                                   adminurl=admin_url,
-                                                   internalurl=internal_url,
-                                                   publicurl=public_url,
-                                                   region=endpoint_region)
+            cloud.keystone_client.endpoints.create(
+                service_id=service.id,
+                adminurl=admin_url,
+                internalurl=internal_url,
+                publicurl=public_url,
+                region=endpoint_region)
 
         module.exit_json(changed=changed)
     except Exception as e:
         module.exit_json(failed=True, changed=True, msg=e)
 
 # import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.openstack import *
+from ansible.module_utils.basic import *  # noqa
+from ansible.module_utils.openstack import *  # noqa
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-ansible/kolla_keystone_user.py b/docker/kolla-ansible/kolla_keystone_user.py
index 5d295c1e2..2d1a739c5 100644
--- a/docker/kolla-ansible/kolla_keystone_user.py
+++ b/docker/kolla-ansible/kolla_keystone_user.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is a barebones file needed to file a gap until Ansible 2.0. No error
-# checking, no deletions, no updates. Idempotent creation only.
+# This file is a barebones file needed to file a gap until Ansible 2.0. No
+# error checking, no deletions, no updates. Idempotent creation only.
 
 # If you look closely, you will see we arent _really_ using the shade module
 # we just use it to slightly abstract the authentication model. As patches land
@@ -24,15 +24,15 @@
 
 import shade
 
+
 def main():
-    module = AnsibleModule(
-        argument_spec = openstack_full_argument_spec(
-            password = dict(required=True, type='str'),
-            project = dict(required=True, type='str'),
-            role = dict(required=True, type='str'),
-            user = dict(required=True, type='str')
-        )
+    argument_spec = openstack_full_argument_spec(
+        password=dict(required=True, type='str'),
+        project=dict(required=True, type='str'),
+        role=dict(required=True, type='str'),
+        user=dict(required=True, type='str')
     )
+    module = AnsibleModule(argument_spec)
 
     try:
         password = module.params.pop('password')
@@ -61,7 +61,8 @@ def main():
 
         if not project:
             changed = True
-            project = cloud.keystone_client.tenants.create(tenant_name=project_name)
+            project = cloud.keystone_client.tenants.create(
+                tenant_name=project_name)
 
         if not role:
             changed = True
@@ -69,15 +70,19 @@ def main():
 
         if not user:
             changed = True
-            user = cloud.keystone_client.users.create(name=user_name, password=password, tenant_id=project.id)
-            cloud.keystone_client.roles.add_user_role(role=role.id, user=user.id, tenant=project.id)
+            user = cloud.keystone_client.users.create(name=user_name,
+                                                      password=password,
+                                                      tenant_id=project.id)
+            cloud.keystone_client.roles.add_user_role(role=role.id,
+                                                      user=user.id,
+                                                      tenant=project.id)
 
         module.exit_json(changed=changed)
     except Exception as e:
         module.exit_json(failed=True, changed=True, msg=e)
 
 # import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.openstack import *
+from ansible.module_utils.basic import *  # noqa
+from ansible.module_utils.openstack import *  # noqa
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-ansible/kolla_sanity.py b/docker/kolla-ansible/kolla_sanity.py
index d579a1093..7f4eea9fc 100644
--- a/docker/kolla-ansible/kolla_sanity.py
+++ b/docker/kolla-ansible/kolla_sanity.py
@@ -57,7 +57,7 @@ def main():
         module.exit_json(failed=True, changed=True, msg=e)
 
 # import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.openstack import *
+from ansible.module_utils.basic import *  # noqa
+from ansible.module_utils.openstack import *  # noqa
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-ansible/kolla_zookeeper.py b/docker/kolla-ansible/kolla_zookeeper.py
index 536200076..d6326f46a 100644
--- a/docker/kolla-ansible/kolla_zookeeper.py
+++ b/docker/kolla-ansible/kolla_zookeeper.py
@@ -61,7 +61,6 @@ def main():
 
 
 # import module snippets
-from ansible.module_utils.basic import *
-
+from ansible.module_utils.basic import *  # noqa
 if __name__ == '__main__':
     main()