Fixes #5023 Convert all modules to use new snippet import pattern

library/cloud/cloudformation

@@ -294,6 +294,6 @@ def main():
     module.exit_json(**result)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/digital_ocean

@@ -420,6 +420,6 @@ def main():
         module.fail_json(msg=str(e))
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/docker

@@ -480,6 +480,6 @@ def main():
         module.exit_json(failed=True, changed=changed, msg=repr(e))
         
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/gc_storage

@@ -414,6 +414,6 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/gce

@@ -417,6 +417,6 @@ def main():
     sys.exit(0)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/gce_lb

@@ -328,6 +328,6 @@ def main():
     sys.exit(0)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/gce_net

@@ -268,6 +268,6 @@ def main():
     sys.exit(0)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/gce_pd

@@ -250,6 +250,6 @@ def main():
     sys.exit(0)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/glance_image

@@ -244,6 +244,6 @@ def main():
             _glance_delete_image(module, module.params, client)
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/keystone_user

@@ -386,6 +386,6 @@ def dispatch(keystone, user=None, password=None, tenant=None,
     return dict(changed=changed, id=id)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 if __name__ == '__main__':
     main()

library/cloud/linode

@@ -483,6 +483,6 @@ def main():
                  payment_term, password, ssh_pub_key, swap, wait, wait_timeout)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/nova_compute

@@ -248,6 +248,6 @@ def main():
         _delete_server(module, nova)
                 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/nova_keypair

@@ -125,6 +125,6 @@ def main():
         module.exit_json(changed = False, result = "not present")
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/ovirt

@@ -416,6 +416,6 @@ def main():
 
 
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/cloud/quantum_floating_ip

@@ -236,6 +236,6 @@ def main():
         module.exit_json(changed=False)
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_floating_ip_associate

@@ -213,6 +213,6 @@ def main():
         module.exit_json(changed = True, result = "detached")
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_network

@@ -275,6 +275,6 @@ def main():
             module.exit_json(changed = True, result = "Deleted")
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_router

@@ -206,6 +206,6 @@ def main():
             module.exit_json(changed=True, result="deleted")
                 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_router_gateway

@@ -209,6 +209,6 @@ def main():
         module.exit_json(changed=True, result="Deleted")
 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_router_interface

@@ -245,6 +245,6 @@ def main():
         module.exit_json(changed=True, result="Deleted")
                         
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/quantum_subnet

@@ -281,6 +281,6 @@ def main():
             module.exit_json(changed = True, result = "deleted")
                 
 # this is magic, see lib/ansible/module.params['common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/cloud/rds

@@ -534,6 +534,6 @@ def main():
     module.exit_json(changed=True, instance=d)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/cloud/virt

@@ -478,5 +478,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/commands/command

@@ -156,8 +156,8 @@ def main():
         changed = True
     )
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 
 # only the command module should ever need to do this
 # everything else should be simple key=value

library/database/mongodb_user

@@ -214,5 +214,5 @@ def main():
     module.exit_json(changed=True, user=user)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/mysql_db

@@ -302,5 +302,5 @@ def main():
     module.exit_json(changed=changed, db=db)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/mysql_replication

@@ -364,5 +364,5 @@ def main():
             module.exit_json(msg="Slave already stopped", changed=False)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/mysql_user

@@ -462,5 +462,5 @@ def main():
     module.exit_json(changed=changed, user=user)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/mysql_variables

@@ -212,5 +212,5 @@ def main():
             module.fail_json(msg=result, changed=False)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/postgresql_db

@@ -270,5 +270,5 @@ def main():
     module.exit_json(changed=changed, db=db)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/postgresql_privs

@@ -608,5 +608,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/postgresql_user

@@ -482,5 +482,5 @@ def main():
     module.exit_json(**kw)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/redis

@@ -277,5 +277,5 @@ def main():
         module.fail_json(msg='A valid command must be provided')
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/database/riak

@@ -250,6 +250,6 @@ def main():
     module.exit_json(**result)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/files/acl

@@ -192,6 +192,6 @@ def main():
     module.exit_json(changed=changed, msg=msg, acl=currentacl)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/files/assemble

@@ -174,7 +174,7 @@ def main():
     module.exit_json(src=src, dest=dest, md5sum=destmd5, changed=changed, msg="OK")
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()
 

library/files/copy

@@ -185,5 +185,5 @@ def main():
     module.exit_json(**res_args)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/files/file

@@ -350,6 +350,6 @@ def main():
         module.fail_json(path=path, msg='unexpected position reached')
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/files/ini_file

@@ -185,5 +185,5 @@ def main():
     module.exit_json(dest=dest, changed=changed, msg="OK")
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/files/lineinfile

@@ -357,6 +357,6 @@ def main():
         absent(module, dest, params['regexp'], params.get('line', None), backup)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/files/stat

@@ -134,6 +134,6 @@ def main():
     module.exit_json(changed=False, stat=d)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/files/synchronize

@@ -237,8 +237,8 @@ def main():
         return module.exit_json(changed=changed, msg=out.replace(changed_marker,''),
                                 rc=rc, cmd=cmdstr)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 
 main()
 

library/files/unarchive

@@ -195,5 +195,5 @@ def main():
     module.exit_json(**res_args)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/files/xattr

@@ -201,6 +201,6 @@ def main():
     module.exit_json(changed=changed, msg=msg, xattr=res)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/internal/async_status

@@ -95,5 +95,5 @@ def main():
     module.exit_json(**data)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/messaging/rabbitmq_parameter

@@ -147,5 +147,5 @@ def main():
     module.exit_json(changed=changed, component=component, name=name, vhost=vhost, state=state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/messaging/rabbitmq_plugin

@@ -126,5 +126,5 @@ def main():
     module.exit_json(changed=changed, enabled=enabled, disabled=disabled)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/messaging/rabbitmq_user

@@ -244,5 +244,5 @@ def main():
     module.exit_json(changed=changed, user=username, state=state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/messaging/rabbitmq_vhost

@@ -142,5 +142,5 @@ def main():
     module.exit_json(changed=changed, name=name, state=state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/monitoring/airbrake_deployment

@@ -127,6 +127,6 @@ def main():
             module.fail_json(msg="HTTP result code: %d" % result.code)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/monitoring/boundary_meter

@@ -266,7 +266,7 @@ def main():
 
     module.exit_json(status=result,changed=True)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/monitoring/datadog_event

@@ -134,5 +134,5 @@ def post_event(module):
         module.fail_json(msg="Socket error: %s to %s" % (e, uri))
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/monitoring/monit

@@ -143,6 +143,6 @@ def main():
     module.exit_json(changed=False, name=name, state=state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/monitoring/nagios

@@ -876,5 +876,5 @@ class Nagios(object):
 
 ######################################################################
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/monitoring/newrelic_deployment

@@ -157,6 +157,6 @@ def main():
             module.fail_json(msg="result code: %d" % result.code)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/monitoring/pagerduty

@@ -159,6 +159,6 @@ def main():
 
     module.exit_json(msg="success", result=out)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/monitoring/pingdom

@@ -130,6 +130,6 @@ def main():
 
     module.exit_json(checkid=checkid, name=name, status=result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/arista_interface

@@ -254,6 +254,6 @@ def main():
     module.exit_json(**result)
     
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/arista_l2interface

@@ -332,6 +332,6 @@ def main():
     module.exit_json(**result)
 
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/arista_lag

@@ -319,6 +319,6 @@ def main():
     module.exit_json(**result)
 
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/arista_vlan

@@ -302,6 +302,6 @@ def main():
     module.exit_json(**result)
     
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/bigip_monitor_http

@@ -443,7 +443,7 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/net_infrastructure/bigip_monitor_tcp

@@ -465,7 +465,7 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/net_infrastructure/bigip_node

@@ -288,7 +288,7 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/net_infrastructure/bigip_pool

@@ -530,7 +530,7 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/net_infrastructure/bigip_pool_member

@@ -372,7 +372,7 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()
 

library/net_infrastructure/dnsmadeeasy

@@ -337,5 +337,5 @@ def main():
             msg="'%s' is an unknown value for the state argument" % state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/netscaler

@@ -176,5 +176,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/openvswitch_bridge

@@ -126,5 +126,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/net_infrastructure/openvswitch_port

@@ -130,5 +130,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/network/get_url

@@ -364,5 +364,5 @@ def main():
         sha256sum=sha256sum, changed=changed, msg=info.get('msg', ''))
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/network/slurp

@@ -69,7 +69,7 @@ def main():
     module.exit_json(content=data, encoding='base64')
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()
 

library/network/uri

@@ -421,5 +421,5 @@ def main():
 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/campfire

@@ -129,5 +129,5 @@ def main():
     module.exit_json(changed=True, room=room, msg=msg, notify=notify)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/flowdock

@@ -195,6 +195,6 @@ def main():
     module.exit_json(changed=False, msg=module.params["msg"])
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()
 

library/notification/grove

@@ -84,5 +84,5 @@ def main():
     module.exit_json(msg="OK")
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/hipchat

@@ -140,5 +140,5 @@ def main():
                      msg=msg)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/irc

@@ -155,5 +155,5 @@ def main():
                      msg=msg)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/jabber

@@ -142,5 +142,5 @@ def main():
     module.exit_json(changed=False, to=to, user=user, msg=msg.getBody())
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/mail

@@ -248,5 +248,5 @@ def main():
     module.exit_json(changed=False)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/mqtt

@@ -176,5 +176,5 @@ def main():
     module.exit_json(changed=False, topic=topic)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/notification/osx_say

@@ -72,5 +72,5 @@ def main():
     module.exit_json(msg=msg, changed=False) 
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/packaging/apt

@@ -435,6 +435,6 @@ def main():
         module.fail_json(msg="Failed to lock apt for exclusive operation")
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/apt_key

@@ -238,6 +238,6 @@ def main():
 
     module.exit_json(changed=changed, **return_values)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/packaging/apt_repository

@@ -382,6 +382,6 @@ def main():
     module.exit_json(changed=changed, repo=repo, state=state)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/easy_install

@@ -180,6 +180,6 @@ def main():
                      name=name, virtualenv=env)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/gem

@@ -222,6 +222,6 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/packaging/homebrew

@@ -171,6 +171,6 @@ def main():
         remove_packages(module, brew_path, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/macports

@@ -210,6 +210,6 @@ def main():
         deactivate_packages(module, port_path, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/npm

@@ -224,5 +224,5 @@ def main():
     module.exit_json(changed=changed)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/packaging/openbsd_pkg

@@ -277,5 +277,5 @@ def main():
     module.exit_json(**result)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 main()

library/packaging/opkg

@@ -144,6 +144,6 @@ def main():
         remove_packages(module, opkg_path, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/pacman

@@ -213,6 +213,6 @@ def main():
         remove_packages(module, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
     
 main()        

library/packaging/pip

@@ -347,6 +347,6 @@ def main():
                      state=state, requirements=requirements, virtualenv=env, stdout=out, stderr=err)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/pkgin

@@ -163,6 +163,6 @@ def main():
         remove_packages(module, pkgin_path, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/pkgng

@@ -156,6 +156,6 @@ def main():
         remove_packages(module, pkgin_path, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
     
 main()        

library/packaging/pkgutil

@@ -173,6 +173,6 @@ def main():
 
     module.exit_json(**result)
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/packaging/portinstall

@@ -203,6 +203,6 @@ def main():
         remove_packages(module, pkgs)
 
 # this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+from ansible.module_utils.basic import *
 
 main()

library/packaging/redhat_subscription

@@ -411,6 +411,6 @@ def main():
                 module.exit_json(changed=True, msg="System successfully unregistered from %s." % server_hostname)
 
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()

library/packaging/rhn_channel

@@ -147,6 +147,6 @@ def main():
     client.auth.logout(session)
 
 
-# include magic from lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# import module snippets
+from ansible.module_utils.basic import *
 main()