4 files changed, 20 insertions, 16 deletions
diff --git a/docker/kolla-toolbox/find_disks.py b/docker/kolla-toolbox/find_disks.py
index 5b33882e2..f8175eae0 100644
--- a/docker/kolla-toolbox/find_disks.py
+++ b/docker/kolla-toolbox/find_disks.py
@@ -17,6 +17,13 @@
 # This module has been relicensed from the source below:
 # https://github.com/SamYaple/yaodu/blob/master/ansible/library/ceph_osd_list
 
+import json
+import pyudev
+import re
+import subprocess  # nosec
+
+from ansible.module_utils.basic import AnsibleModule
+
 DOCUMENTATION = '''
 ---
 module: find_disks
@@ -74,11 +81,6 @@ EXAMPLES = '''
       register: swift_disks
 '''
 
-import json
-import pyudev
-import re
-import subprocess  # nosec
-
 
 PREFERRED_DEVICE_LINK_ORDER = [
     '/dev/disk/by-uuid',
@@ -354,7 +356,6 @@ def main():
     except Exception as e:
         module.exit_json(failed=True, msg=repr(e))
 
-# import module snippets
-from ansible.module_utils.basic import *  # noqa
+
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-toolbox/kolla_keystone_service.py b/docker/kolla-toolbox/kolla_keystone_service.py
index ca747e71e..866350821 100644
--- a/docker/kolla-toolbox/kolla_keystone_service.py
+++ b/docker/kolla-toolbox/kolla_keystone_service.py
@@ -26,6 +26,9 @@ import traceback
 
 import shade
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.openstack import openstack_full_argument_spec
+
 
 def main():
     argument_spec = openstack_full_argument_spec(
@@ -94,8 +97,6 @@ def main():
         module.exit_json(failed=True, changed=True,
                          msg=repr(traceback.format_exc()))
 
-# import module snippets
-from ansible.module_utils.basic import *  # noqa
-from ansible.module_utils.openstack import *  # noqa
+
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-toolbox/kolla_keystone_user.py b/docker/kolla-toolbox/kolla_keystone_user.py
index 319cf67c8..af7d0d6ec 100644
--- a/docker/kolla-toolbox/kolla_keystone_user.py
+++ b/docker/kolla-toolbox/kolla_keystone_user.py
@@ -18,6 +18,9 @@ import traceback
 
 import shade
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.openstack import openstack_full_argument_spec
+
 
 def main():
     argument_spec = openstack_full_argument_spec(
@@ -83,8 +86,6 @@ def main():
         module.exit_json(failed=True, changed=True,
                          msg=repr(traceback.format_exc()))
 
-# import module snippets
-from ansible.module_utils.basic import *  # noqa
-from ansible.module_utils.openstack import *  # noqa
+
 if __name__ == '__main__':
     main()
diff --git a/docker/kolla-toolbox/kolla_sanity.py b/docker/kolla-toolbox/kolla_sanity.py
index 3df8d2ac2..4de0026b8 100644
--- a/docker/kolla-toolbox/kolla_sanity.py
+++ b/docker/kolla-toolbox/kolla_sanity.py
@@ -26,6 +26,9 @@ import traceback
 
 import shade
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.openstack import openstack_full_argument_spec
+
 
 class SanityChecks(object):
     # TODO(pbourke): remove and replace with direct call to os_object
@@ -56,8 +59,6 @@ def main():
         module.exit_json(failed=True, changed=True,
                          msg=repr(traceback.format_exc()))
 
-# import module snippets
-from ansible.module_utils.basic import *  # noqa
-from ansible.module_utils.openstack import *  # noqa
+
 if __name__ == '__main__':
     main()