Remove wildcard, add boilerplate and get rid of get_exception

* smaller collections of database modules
* Some of the smaller collections of network modules

lib/ansible/modules/database/misc/elasticsearch_plugin.py

@@ -1,22 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Ansible module to manage elasticsearch plugins
 # (c) 2015, Mathew Davies <thepixeldeveloper@googlemail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 
 ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'status': ['preview'],
@@ -102,11 +92,15 @@ EXAMPLES = '''
 
 import os
 
+from ansible.module_utils.basic import AnsibleModule
+
+
 PACKAGE_STATE_MAP = dict(
     present="install",
     absent="remove"
 )
 
+
 def parse_plugin_repo(string):
     elements = string.split("/")
 
@@ -219,7 +213,6 @@ def main():
 
     module.exit_json(changed=changed, cmd=cmd, name=name, state=state, url=url, timeout=timeout, stdout=out, stderr=err)
 
-from ansible.module_utils.basic import *
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/database/misc/kibana_plugin.py

@@ -1,23 +1,14 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Ansible module to manage elasticsearch shield role
 # (c) 2016, Thierno IB. BARRY @barryib
 # Sponsored by Polyconseil http://polyconseil.fr.
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 
 ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'status': ['preview'],
@@ -129,11 +120,15 @@ state:
 
 import os
 
+from ansible.module_utils.basic import AnsibleModule
+
+
 PACKAGE_STATE_MAP = dict(
     present="--install",
     absent="--remove"
 )
 
+
 def parse_plugin_repo(string):
     elements = string.split("/")
 
@@ -241,7 +236,6 @@ def main():
 
     module.exit_json(changed=changed, cmd=cmd, name=name, state=state, url=url, timeout=timeout, stdout=out, stderr=err)
 
-from ansible.module_utils.basic import *
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/database/misc/redis.py

@@ -1,20 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+#
+# Copyright: Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
 
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'status': ['preview'],
@@ -141,6 +133,7 @@ EXAMPLES = '''
     name: lua-time-limit
     value: 100
 '''
+import traceback
 
 try:
     import redis
@@ -149,6 +142,9 @@ except ImportError:
 else:
     redis_found = True
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+
 
 # ===========================================
 # Redis module specific support methods.
@@ -231,9 +227,9 @@ def main():
                               password=login_password)
         try:
             r.ping()
-        except Exception:
-            e = get_exception()
-            module.fail_json(msg="unable to connect to database: %s" % e)
+        except Exception as e:
+            module.fail_json(msg="unable to connect to database: %s" % to_native(e),
+                             exception=traceback.format_exc())
 
         #Check if we are already in the mode that we want
         info = r.info()
@@ -291,9 +287,9 @@ def main():
                               db=db)
         try:
             r.ping()
-        except Exception:
-            e = get_exception()
-            module.fail_json(msg="unable to connect to database: %s" % e)
+        except Exception as e:
+            module.fail_json(msg="unable to connect to database: %s" % to_native(e),
+                             exception=traceback.format_exc())
 
         # Do the stuff
         # (Check Check_mode before commands so the commands aren't evaluated
@@ -319,16 +315,16 @@ def main():
 
         try:
             r.ping()
-        except Exception:
-            e = get_exception()
-            module.fail_json(msg="unable to connect to database: %s" % e)
+        except Exception as e:
+            module.fail_json(msg="unable to connect to database: %s" % to_native(e),
+                             exception=traceback.format_exc())
 
 
         try:
             old_value = r.config_get(name)[name]
-        except Exception:
-            e = get_exception()
-            module.fail_json(msg="unable to read config: %s" % e)
+        except Exception as e:
+            module.fail_json(msg="unable to read config: %s" % to_native(e),
+                             exception=traceback.format_exc())
         changed = old_value != value
 
         if module.check_mode or not changed:
@@ -336,16 +332,13 @@ def main():
         else:
             try:
                 r.config_set(name, value)
-            except Exception:
-                e = get_exception()
-                module.fail_json(msg="unable to write config: %s" % e)
+            except Exception as e:
+                module.fail_json(msg="unable to write config: %s" % to_native(e),
+                                 exception=traceback.format_exc())
             module.exit_json(changed=changed, name=name, value=value)
     else:
         module.fail_json(msg='A valid command must be provided')
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.pycompat24 import get_exception
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/database/misc/riak.py

@@ -2,22 +2,12 @@
 # -*- coding: utf-8 -*-
 
 # (c) 2013, James Martin <jmartin@basho.com>, Drew Kerrigan <dkerrigan@basho.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
 ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'status': ['preview'],
                     'supported_by': 'community'}
@@ -97,18 +87,11 @@ EXAMPLES = '''
     wait_for_service: kv
 '''
 
+import json
 import time
-import socket
-import sys
 
-try:
-    import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        # Let snippet from module_utils/basic.py return a proper error in this case
-        pass
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.urls import fetch_url
 
 
 def ring_check(module, riak_admin_bin):
@@ -137,13 +120,11 @@ def main():
 
 
     command = module.params.get('command')
-    config_dir = module.params.get('config_dir')
     http_conn = module.params.get('http_conn')
     target_node = module.params.get('target_node')
     wait_for_handoffs = module.params.get('wait_for_handoffs')
     wait_for_ring = module.params.get('wait_for_ring')
     wait_for_service = module.params.get('wait_for_service')
-    validate_certs =  module.params.get('validate_certs')
 
 
     #make sure riak commands are on the path
@@ -255,8 +236,6 @@ def main():
 
     module.exit_json(**result)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.urls import *
+
 if __name__ == '__main__':
     main()