From ad837709bdcf1b4d5441bc298369e98531696573 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Mon, 2 Dec 2013 15:13:49 -0500 Subject: [PATCH] Addresses #5023 Fix import comments --- library/cloud/cloudformation | 2 +- library/cloud/digital_ocean | 2 +- library/cloud/docker | 2 +- library/cloud/gc_storage | 2 +- library/cloud/gce | 2 +- library/cloud/gce_lb | 2 +- library/cloud/gce_net | 2 +- library/cloud/gce_pd | 2 +- library/cloud/keystone_user | 2 +- library/cloud/linode | 2 +- library/cloud/rds | 2 +- library/cloud/virt | 2 +- library/database/mongodb_user | 2 +- library/database/mysql_db | 2 +- library/database/mysql_replication | 2 +- library/database/mysql_user | 2 +- library/database/mysql_variables | 2 +- library/database/postgresql_db | 2 +- library/database/postgresql_privs | 2 +- library/database/postgresql_user | 2 +- library/database/redis | 2 +- library/database/riak | 2 +- library/files/acl | 2 +- library/files/assemble | 2 +- library/files/copy | 2 +- library/files/file | 2 +- library/files/ini_file | 2 +- library/files/lineinfile | 2 +- library/files/stat | 2 +- library/files/unarchive | 2 +- library/files/xattr | 2 +- library/internal/async_status | 2 +- library/messaging/rabbitmq_parameter | 2 +- library/messaging/rabbitmq_plugin | 2 +- library/messaging/rabbitmq_user | 2 +- library/messaging/rabbitmq_vhost | 2 +- library/monitoring/airbrake_deployment | 2 +- library/monitoring/datadog_event | 2 +- library/monitoring/monit | 2 +- library/monitoring/nagios | 2 +- library/monitoring/newrelic_deployment | 2 +- library/net_infrastructure/dnsmadeeasy | 2 +- library/net_infrastructure/netscaler | 2 +- library/net_infrastructure/openvswitch_bridge | 2 +- library/net_infrastructure/openvswitch_port | 2 +- library/network/get_url | 2 +- library/network/slurp | 2 +- library/network/uri | 2 +- library/notification/campfire | 2 +- library/notification/flowdock | 2 +- library/notification/grove | 2 +- library/notification/hipchat | 2 +- library/notification/irc | 2 +- library/notification/jabber | 2 +- library/notification/mail | 2 +- library/notification/mqtt | 2 +- library/notification/osx_say | 2 +- library/packaging/apt | 2 +- library/packaging/apt_repository | 2 +- library/packaging/easy_install | 2 +- library/packaging/homebrew | 2 +- library/packaging/macports | 2 +- library/packaging/npm | 2 +- library/packaging/openbsd_pkg | 2 +- library/packaging/opkg | 2 +- library/packaging/pacman | 2 +- library/packaging/pip | 2 +- library/packaging/pkgin | 2 +- library/packaging/pkgng | 2 +- library/packaging/portinstall | 2 +- library/packaging/swdepot | 2 +- library/packaging/urpmi | 2 +- library/packaging/yum | 2 +- library/packaging/zypper | 2 +- library/packaging/zypper_repository | 2 +- library/system/authorized_key | 2 +- library/system/facter | 2 +- library/system/filesystem | 2 +- library/system/kernel_blacklist | 2 +- library/system/lvg | 2 +- library/system/lvol | 2 +- library/system/modprobe | 2 +- library/system/mount | 2 +- library/system/ohai | 2 +- library/system/open_iscsi | 2 +- library/system/setup | 2 +- library/system/sysctl | 2 +- library/utilities/accelerate | 2 +- library/utilities/fireball | 2 +- library/utilities/wait_for | 2 +- library/web_infrastructure/django_manage | 2 +- library/web_infrastructure/htpasswd | 2 +- library/web_infrastructure/jboss | 2 +- library/web_infrastructure/supervisorctl | 2 +- 94 files changed, 94 insertions(+), 94 deletions(-) diff --git a/library/cloud/cloudformation b/library/cloud/cloudformation index afacb694f13..af401036c75 100644 --- a/library/cloud/cloudformation +++ b/library/cloud/cloudformation @@ -293,7 +293,7 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/digital_ocean b/library/cloud/digital_ocean index 6309fd726b9..400bf3bf54b 100644 --- a/library/cloud/digital_ocean +++ b/library/cloud/digital_ocean @@ -419,7 +419,7 @@ def main(): except (DoError, Exception) as e: module.fail_json(msg=str(e)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/docker b/library/cloud/docker index e6a25ef139a..f97c6988be3 100644 --- a/library/cloud/docker +++ b/library/cloud/docker @@ -479,7 +479,7 @@ def main(): changed = manager.has_changed() module.exit_json(failed=True, changed=changed, msg=repr(e)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/gc_storage b/library/cloud/gc_storage index ccce877bd35..17549b32ecb 100644 --- a/library/cloud/gc_storage +++ b/library/cloud/gc_storage @@ -413,7 +413,7 @@ def main(): module.fail_json(msg="Bucket and Object parameters must be set", failed=True) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/gce b/library/cloud/gce index 598c279a72a..bc9dbc96a9b 100644 --- a/library/cloud/gce +++ b/library/cloud/gce @@ -416,7 +416,7 @@ def main(): print json.dumps(json_output) sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/gce_lb b/library/cloud/gce_lb index 415f36c5b7f..eec637ad487 100644 --- a/library/cloud/gce_lb +++ b/library/cloud/gce_lb @@ -327,7 +327,7 @@ def main(): print json.dumps(json_output) sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/gce_net b/library/cloud/gce_net index 8c0f3fc05b5..5e8d038c585 100644 --- a/library/cloud/gce_net +++ b/library/cloud/gce_net @@ -267,7 +267,7 @@ def main(): print json.dumps(json_output) sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/gce_pd b/library/cloud/gce_pd index b2aa27d21ff..34b28d9d92c 100644 --- a/library/cloud/gce_pd +++ b/library/cloud/gce_pd @@ -249,7 +249,7 @@ def main(): print json.dumps(json_output) sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/keystone_user b/library/cloud/keystone_user index 2ccaef175fa..ae8e157c4e3 100644 --- a/library/cloud/keystone_user +++ b/library/cloud/keystone_user @@ -385,7 +385,7 @@ def dispatch(keystone, user=None, password=None, tenant=None, return dict(changed=changed, id=id) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * if __name__ == '__main__': main() diff --git a/library/cloud/linode b/library/cloud/linode index 04265409099..deb7a9f3670 100644 --- a/library/cloud/linode +++ b/library/cloud/linode @@ -482,7 +482,7 @@ def main(): linodeServers(module, api, state, name, plan, distribution, datacenter, linode_id, payment_term, password, ssh_pub_key, swap, wait, wait_timeout) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/rds b/library/cloud/rds index b7eb5bb0a50..85ded62d59e 100644 --- a/library/cloud/rds +++ b/library/cloud/rds @@ -533,7 +533,7 @@ def main(): module.exit_json(changed=True, instance=d) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/cloud/virt b/library/cloud/virt index 551768e2a6a..42e99209b14 100644 --- a/library/cloud/virt +++ b/library/cloud/virt @@ -477,6 +477,6 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/mongodb_user b/library/database/mongodb_user index ab3a027e0a2..b2fa045071b 100644 --- a/library/database/mongodb_user +++ b/library/database/mongodb_user @@ -213,6 +213,6 @@ def main(): module.exit_json(changed=True, user=user) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/mysql_db b/library/database/mysql_db index 2e91a66f790..f949cced301 100644 --- a/library/database/mysql_db +++ b/library/database/mysql_db @@ -301,6 +301,6 @@ def main(): module.exit_json(changed=changed, db=db) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/mysql_replication b/library/database/mysql_replication index 0659ac524c9..f18060e9556 100644 --- a/library/database/mysql_replication +++ b/library/database/mysql_replication @@ -363,6 +363,6 @@ def main(): else: module.exit_json(msg="Slave already stopped", changed=False) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/mysql_user b/library/database/mysql_user index 4542f4dd371..1eeb81f112c 100644 --- a/library/database/mysql_user +++ b/library/database/mysql_user @@ -461,6 +461,6 @@ def main(): changed = False module.exit_json(changed=changed, user=user) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/mysql_variables b/library/database/mysql_variables index 0bb5397334b..720478cc005 100644 --- a/library/database/mysql_variables +++ b/library/database/mysql_variables @@ -211,6 +211,6 @@ def main(): else: module.fail_json(msg=result, changed=False) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/postgresql_db b/library/database/postgresql_db index 11b77092f2a..7c4d5a99ac9 100644 --- a/library/database/postgresql_db +++ b/library/database/postgresql_db @@ -269,6 +269,6 @@ def main(): module.exit_json(changed=changed, db=db) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/postgresql_privs b/library/database/postgresql_privs index e1bf03614ff..2f3db9a93f1 100644 --- a/library/database/postgresql_privs +++ b/library/database/postgresql_privs @@ -607,6 +607,6 @@ def main(): module.exit_json(changed=changed) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/postgresql_user b/library/database/postgresql_user index 1798eafcc12..1bda98d18cb 100644 --- a/library/database/postgresql_user +++ b/library/database/postgresql_user @@ -481,6 +481,6 @@ def main(): kw['changed'] = changed module.exit_json(**kw) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/redis b/library/database/redis index ead1a1dacf0..4e3793daa09 100644 --- a/library/database/redis +++ b/library/database/redis @@ -276,6 +276,6 @@ def main(): else: module.fail_json(msg='A valid command must be provided') -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/database/riak b/library/database/riak index 712c94e994e..21673fa0135 100644 --- a/library/database/riak +++ b/library/database/riak @@ -249,7 +249,7 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/acl b/library/files/acl index 1dbaf198b6f..0b1ff4f0f08 100644 --- a/library/files/acl +++ b/library/files/acl @@ -191,7 +191,7 @@ def main(): msg="%s. %d entries changed" % (msg,changes) module.exit_json(changed=changed, msg=msg, acl=currentacl) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/assemble b/library/files/assemble index c16afe61311..d11276a4a5c 100644 --- a/library/files/assemble +++ b/library/files/assemble @@ -173,7 +173,7 @@ def main(): # Mission complete module.exit_json(src=src, dest=dest, md5sum=destmd5, changed=changed, msg="OK") -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/copy b/library/files/copy index 2ba313eb7e2..8af38d41aa4 100644 --- a/library/files/copy +++ b/library/files/copy @@ -184,6 +184,6 @@ def main(): module.exit_json(**res_args) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/file b/library/files/file index a26373f7284..134b5284efd 100644 --- a/library/files/file +++ b/library/files/file @@ -349,7 +349,7 @@ def main(): else: module.fail_json(path=path, msg='unexpected position reached') -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/ini_file b/library/files/ini_file index 6bed212b517..d25d468cd17 100644 --- a/library/files/ini_file +++ b/library/files/ini_file @@ -184,6 +184,6 @@ def main(): # Mission complete module.exit_json(dest=dest, changed=changed, msg="OK") -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/lineinfile b/library/files/lineinfile index 185734c0c28..82658cae654 100644 --- a/library/files/lineinfile +++ b/library/files/lineinfile @@ -356,7 +356,7 @@ def main(): absent(module, dest, params['regexp'], params.get('line', None), backup) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/stat b/library/files/stat index 6f38534d383..54cc11111a5 100644 --- a/library/files/stat +++ b/library/files/stat @@ -133,7 +133,7 @@ def main(): module.exit_json(changed=False, stat=d) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/unarchive b/library/files/unarchive index 519fa9a34f2..52d0f49a9f9 100644 --- a/library/files/unarchive +++ b/library/files/unarchive @@ -194,6 +194,6 @@ def main(): module.exit_json(**res_args) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/files/xattr b/library/files/xattr index 5b07405717a..25179e3c628 100644 --- a/library/files/xattr +++ b/library/files/xattr @@ -200,7 +200,7 @@ def main(): module.exit_json(changed=changed, msg=msg, xattr=res) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/internal/async_status b/library/internal/async_status index 0f2290aa5c0..853f4533765 100644 --- a/library/internal/async_status +++ b/library/internal/async_status @@ -94,6 +94,6 @@ def main(): module.exit_json(**data) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/messaging/rabbitmq_parameter b/library/messaging/rabbitmq_parameter index 817b2705e50..2b540cbfdee 100644 --- a/library/messaging/rabbitmq_parameter +++ b/library/messaging/rabbitmq_parameter @@ -146,6 +146,6 @@ def main(): module.exit_json(changed=changed, component=component, name=name, vhost=vhost, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/messaging/rabbitmq_plugin b/library/messaging/rabbitmq_plugin index d35827afa33..3a6e02122d3 100644 --- a/library/messaging/rabbitmq_plugin +++ b/library/messaging/rabbitmq_plugin @@ -125,6 +125,6 @@ def main(): changed = len(enabled) > 0 or len(disabled) > 0 module.exit_json(changed=changed, enabled=enabled, disabled=disabled) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/messaging/rabbitmq_user b/library/messaging/rabbitmq_user index dcf09aa93d0..175bc0c1624 100644 --- a/library/messaging/rabbitmq_user +++ b/library/messaging/rabbitmq_user @@ -243,6 +243,6 @@ def main(): module.exit_json(changed=changed, user=username, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/messaging/rabbitmq_vhost b/library/messaging/rabbitmq_vhost index 3486727c246..122f84e5761 100644 --- a/library/messaging/rabbitmq_vhost +++ b/library/messaging/rabbitmq_vhost @@ -141,6 +141,6 @@ def main(): module.exit_json(changed=changed, name=name, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/monitoring/airbrake_deployment b/library/monitoring/airbrake_deployment index fe164fdd432..b77b3a70419 100644 --- a/library/monitoring/airbrake_deployment +++ b/library/monitoring/airbrake_deployment @@ -126,7 +126,7 @@ def main(): else: module.fail_json(msg="HTTP result code: %d" % result.code) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/monitoring/datadog_event b/library/monitoring/datadog_event index 2dcd932d98e..629e86e98ab 100644 --- a/library/monitoring/datadog_event +++ b/library/monitoring/datadog_event @@ -133,6 +133,6 @@ def post_event(module): except socket.error, e: module.fail_json(msg="Socket error: %s to %s" % (e, uri)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/monitoring/monit b/library/monitoring/monit index 664e4d39cd4..32e3e058121 100644 --- a/library/monitoring/monit +++ b/library/monitoring/monit @@ -142,7 +142,7 @@ def main(): module.exit_json(changed=False, name=name, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/monitoring/nagios b/library/monitoring/nagios index 1f40efbf545..a66583b0c62 100644 --- a/library/monitoring/nagios +++ b/library/monitoring/nagios @@ -875,6 +875,6 @@ class Nagios(object): changed=True) ###################################################################### -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/monitoring/newrelic_deployment b/library/monitoring/newrelic_deployment index c0d5c4beaae..de64651969c 100644 --- a/library/monitoring/newrelic_deployment +++ b/library/monitoring/newrelic_deployment @@ -156,7 +156,7 @@ def main(): else: module.fail_json(msg="result code: %d" % result.code) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/net_infrastructure/dnsmadeeasy b/library/net_infrastructure/dnsmadeeasy index a2ad7bb93cf..d4af13e884a 100644 --- a/library/net_infrastructure/dnsmadeeasy +++ b/library/net_infrastructure/dnsmadeeasy @@ -336,6 +336,6 @@ def main(): module.fail_json( msg="'%s' is an unknown value for the state argument" % state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/net_infrastructure/netscaler b/library/net_infrastructure/netscaler index bb5df47f805..1aa370895d5 100644 --- a/library/net_infrastructure/netscaler +++ b/library/net_infrastructure/netscaler @@ -175,6 +175,6 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/net_infrastructure/openvswitch_bridge b/library/net_infrastructure/openvswitch_bridge index b45013f2872..9e8d521d39e 100644 --- a/library/net_infrastructure/openvswitch_bridge +++ b/library/net_infrastructure/openvswitch_bridge @@ -125,6 +125,6 @@ def main(): br.run() -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/net_infrastructure/openvswitch_port b/library/net_infrastructure/openvswitch_port index b8c454005f6..a33946e9a1b 100644 --- a/library/net_infrastructure/openvswitch_port +++ b/library/net_infrastructure/openvswitch_port @@ -129,6 +129,6 @@ def main(): port.run() -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/network/get_url b/library/network/get_url index f3351527b33..485a607ccc8 100644 --- a/library/network/get_url +++ b/library/network/get_url @@ -363,6 +363,6 @@ def main(): module.exit_json(url=url, dest=dest, src=tmpsrc, md5sum=md5sum_src, sha256sum=sha256sum, changed=changed, msg=info.get('msg', '')) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/network/slurp b/library/network/slurp index a8a42443b82..744032c2cd6 100644 --- a/library/network/slurp +++ b/library/network/slurp @@ -68,7 +68,7 @@ def main(): module.exit_json(content=data, encoding='base64') -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/network/uri b/library/network/uri index 39a78cb8cc8..9a22d4758c8 100644 --- a/library/network/uri +++ b/library/network/uri @@ -420,6 +420,6 @@ def main(): module.exit_json(changed=changed, **uresp) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/campfire b/library/notification/campfire index 4b8795fd74a..9bdc78796a5 100644 --- a/library/notification/campfire +++ b/library/notification/campfire @@ -128,6 +128,6 @@ def main(): module.exit_json(changed=True, room=room, msg=msg, notify=notify) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/flowdock b/library/notification/flowdock index 9a391714f7c..a5be40d1f10 100644 --- a/library/notification/flowdock +++ b/library/notification/flowdock @@ -194,7 +194,7 @@ def main(): module.exit_json(changed=False, msg=module.params["msg"]) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/grove b/library/notification/grove index 6979d45b0f2..467f6962776 100644 --- a/library/notification/grove +++ b/library/notification/grove @@ -83,6 +83,6 @@ def main(): # Mission complete module.exit_json(msg="OK") -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/hipchat b/library/notification/hipchat index 02c61c22eea..eec2b8c3618 100644 --- a/library/notification/hipchat +++ b/library/notification/hipchat @@ -139,6 +139,6 @@ def main(): module.exit_json(changed=changed, room=room, msg_from=msg_from, msg=msg) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/irc b/library/notification/irc index 92df1c98310..1948d54c0db 100644 --- a/library/notification/irc +++ b/library/notification/irc @@ -154,6 +154,6 @@ def main(): module.exit_json(changed=False, channel=channel, nick=nick, msg=msg) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/jabber b/library/notification/jabber index eb94d107aff..8a7eed37b33 100644 --- a/library/notification/jabber +++ b/library/notification/jabber @@ -141,6 +141,6 @@ def main(): module.exit_json(changed=False, to=to, user=user, msg=msg.getBody()) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/mail b/library/notification/mail index 9f69447de97..56211c6807e 100644 --- a/library/notification/mail +++ b/library/notification/mail @@ -247,6 +247,6 @@ def main(): module.exit_json(changed=False) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/mqtt b/library/notification/mqtt index 4f64c4b78ed..d00307018dc 100644 --- a/library/notification/mqtt +++ b/library/notification/mqtt @@ -175,6 +175,6 @@ def main(): module.exit_json(changed=False, topic=topic) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/notification/osx_say b/library/notification/osx_say index 98d559ab42a..8bde688349a 100644 --- a/library/notification/osx_say +++ b/library/notification/osx_say @@ -71,6 +71,6 @@ def main(): module.exit_json(msg=msg, changed=False) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/apt b/library/packaging/apt index a16912af958..829a689fc2e 100644 --- a/library/packaging/apt +++ b/library/packaging/apt @@ -434,7 +434,7 @@ def main(): except apt.cache.LockFailedException: module.fail_json(msg="Failed to lock apt for exclusive operation") -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/apt_repository b/library/packaging/apt_repository index 7e0fd1a0139..9965bc22a38 100644 --- a/library/packaging/apt_repository +++ b/library/packaging/apt_repository @@ -381,7 +381,7 @@ def main(): module.exit_json(changed=changed, repo=repo, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/easy_install b/library/packaging/easy_install index 9c542a22e1b..88f867dd285 100644 --- a/library/packaging/easy_install +++ b/library/packaging/easy_install @@ -179,7 +179,7 @@ def main(): module.exit_json(changed=changed, binary=easy_install, name=name, virtualenv=env) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/homebrew b/library/packaging/homebrew index 0ff162db4c6..8801a4e6c4d 100644 --- a/library/packaging/homebrew +++ b/library/packaging/homebrew @@ -170,7 +170,7 @@ def main(): elif p["state"] in ["absent", "removed"]: remove_packages(module, brew_path, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/macports b/library/packaging/macports index 898bdfbd889..b58224b63fe 100644 --- a/library/packaging/macports +++ b/library/packaging/macports @@ -209,7 +209,7 @@ def main(): elif p["state"] == "inactive": deactivate_packages(module, port_path, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/npm b/library/packaging/npm index a8de161583d..0cdcf64c63b 100644 --- a/library/packaging/npm +++ b/library/packaging/npm @@ -223,6 +223,6 @@ def main(): module.exit_json(changed=changed) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/openbsd_pkg b/library/packaging/openbsd_pkg index f8db14de56f..7ce78497dc5 100644 --- a/library/packaging/openbsd_pkg +++ b/library/packaging/openbsd_pkg @@ -276,6 +276,6 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/opkg b/library/packaging/opkg index 75c75ad0112..4a834cf1a39 100644 --- a/library/packaging/opkg +++ b/library/packaging/opkg @@ -143,7 +143,7 @@ def main(): elif p["state"] in ["absent", "removed"]: remove_packages(module, opkg_path, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/pacman b/library/packaging/pacman index 9865ae752cc..1b495dd1807 100644 --- a/library/packaging/pacman +++ b/library/packaging/pacman @@ -212,7 +212,7 @@ def main(): elif p["state"] == "absent": remove_packages(module, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/pip b/library/packaging/pip index a862415ef56..13cf162fe15 100644 --- a/library/packaging/pip +++ b/library/packaging/pip @@ -346,7 +346,7 @@ def main(): module.exit_json(changed=changed, cmd=cmd, name=name, version=version, state=state, requirements=requirements, virtualenv=env, stdout=out, stderr=err) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/pkgin b/library/packaging/pkgin index 1ff8897396f..0554cf9a216 100755 --- a/library/packaging/pkgin +++ b/library/packaging/pkgin @@ -162,7 +162,7 @@ def main(): elif p["state"] == "absent": remove_packages(module, pkgin_path, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/pkgng b/library/packaging/pkgng index 8500a40f588..7b0468a7cbd 100644 --- a/library/packaging/pkgng +++ b/library/packaging/pkgng @@ -155,7 +155,7 @@ def main(): elif p["state"] == "absent": remove_packages(module, pkgin_path, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/portinstall b/library/packaging/portinstall index b83214aebd9..4bef8035be3 100644 --- a/library/packaging/portinstall +++ b/library/packaging/portinstall @@ -202,7 +202,7 @@ def main(): elif p["state"] == "absent": remove_packages(module, pkgs) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/swdepot b/library/packaging/swdepot index 230f6a5f0b0..6fd89088cc0 100644 --- a/library/packaging/swdepot +++ b/library/packaging/swdepot @@ -188,7 +188,7 @@ def main(): module.exit_json(changed=changed, name=name, state=state, msg=msg) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/urpmi b/library/packaging/urpmi index 8ce147f6e66..b001ed94dee 100644 --- a/library/packaging/urpmi +++ b/library/packaging/urpmi @@ -202,7 +202,7 @@ def main(): elif p['state'] in [ 'removed', 'absent' ]: remove_packages(module, packages) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/yum b/library/packaging/yum index 08716a325b6..4c930f2f777 100644 --- a/library/packaging/yum +++ b/library/packaging/yum @@ -737,7 +737,7 @@ def main(): disablerepo, disable_gpg_check) module.fail_json(msg="we should never get here unless this all failed", **res) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/zypper b/library/packaging/zypper index abe91d3e859..887ec108c68 100644 --- a/library/packaging/zypper +++ b/library/packaging/zypper @@ -224,6 +224,6 @@ def main(): module.exit_json(**result) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/packaging/zypper_repository b/library/packaging/zypper_repository index 9460660984e..f585d0bde2e 100644 --- a/library/packaging/zypper_repository +++ b/library/packaging/zypper_repository @@ -151,7 +151,7 @@ def main(): module.exit_json(changed=changed, repo=repo, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/authorized_key b/library/system/authorized_key index 33b880a5067..02f2db1320f 100644 --- a/library/system/authorized_key +++ b/library/system/authorized_key @@ -383,6 +383,6 @@ def main(): results = enforce_state(module, module.params) module.exit_json(**results) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/facter b/library/system/facter index 83d3f5afb7a..a72cdc6536f 100644 --- a/library/system/facter +++ b/library/system/facter @@ -49,7 +49,7 @@ def main(): rc, out, err = module.run_command(cmd, check_rc=True) module.exit_json(**json.loads(out)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/filesystem b/library/system/filesystem index f85e602ae17..698c71d4534 100644 --- a/library/system/filesystem +++ b/library/system/filesystem @@ -107,6 +107,6 @@ def main(): module.exit_json(changed=changed) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/kernel_blacklist b/library/system/kernel_blacklist index 8966d8c153f..6af08c0788c 100644 --- a/library/system/kernel_blacklist +++ b/library/system/kernel_blacklist @@ -136,6 +136,6 @@ def main(): module.exit_json(**args) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/lvg b/library/system/lvg index 19e09a446c1..4e24b25a5c9 100644 --- a/library/system/lvg +++ b/library/system/lvg @@ -228,6 +228,6 @@ def main(): module.exit_json(changed=changed) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/lvol b/library/system/lvol index 06338b7df46..65e6f979859 100644 --- a/library/system/lvol +++ b/library/system/lvol @@ -205,6 +205,6 @@ def main(): module.exit_json(changed=changed,msg=msg) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/modprobe b/library/system/modprobe index c6eff44190e..80ec66d9b18 100755 --- a/library/system/modprobe +++ b/library/system/modprobe @@ -94,6 +94,6 @@ def main(): module.exit_json(**args) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/mount b/library/system/mount index 9696760a97b..a2e0dc84171 100644 --- a/library/system/mount +++ b/library/system/mount @@ -318,6 +318,6 @@ def main(): module.fail_json(msg='Unexpected position reached') sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/ohai b/library/system/ohai index 19c87da7874..b50abc9db03 100644 --- a/library/system/ohai +++ b/library/system/ohai @@ -48,7 +48,7 @@ def main(): rc, out, err = module.run_command(cmd, check_rc=True) module.exit_json(**json.loads(out)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/open_iscsi b/library/system/open_iscsi index afce585cd7e..2e57727cf59 100644 --- a/library/system/open_iscsi +++ b/library/system/open_iscsi @@ -370,7 +370,7 @@ def main(): -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/setup b/library/system/setup index ab84cbb5d90..7d69d22d834 100755 --- a/library/system/setup +++ b/library/system/setup @@ -2205,6 +2205,6 @@ def main(): data = run_setup(module) module.exit_json(**data) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/system/sysctl b/library/system/sysctl index cc3091f2a74..71320a3453c 100644 --- a/library/system/sysctl +++ b/library/system/sysctl @@ -339,6 +339,6 @@ def main(): module.exit_json(changed=changed, **sysctl_args) sys.exit(0) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/utilities/accelerate b/library/utilities/accelerate index 2c098c6571a..92bb1a7afed 100644 --- a/library/utilities/accelerate +++ b/library/utilities/accelerate @@ -450,6 +450,6 @@ def main(): daemonize(module, password, port, timeout, minutes, ipv6) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/utilities/fireball b/library/utilities/fireball index ff8c6b172d3..43760969a89 100644 --- a/library/utilities/fireball +++ b/library/utilities/fireball @@ -275,6 +275,6 @@ def main(): daemonize(module, password, port, minutes) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/utilities/wait_for b/library/utilities/wait_for index a6b1d324f9e..bee2f003b6f 100644 --- a/library/utilities/wait_for +++ b/library/utilities/wait_for @@ -196,6 +196,6 @@ def main(): elapsed = datetime.datetime.now() - start module.exit_json(state=state, port=port, search_regex=search_regex, path=path, elapsed=elapsed.seconds) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/web_infrastructure/django_manage b/library/web_infrastructure/django_manage index ed31d33e3de..f6ea9c49149 100644 --- a/library/web_infrastructure/django_manage +++ b/library/web_infrastructure/django_manage @@ -273,7 +273,7 @@ def main(): module.exit_json(changed=changed, out=out, cmd=cmd, app_path=app_path, virtualenv=virtualenv, settings=module.params['settings'], pythonpath=module.params['pythonpath']) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/web_infrastructure/htpasswd b/library/web_infrastructure/htpasswd index 6d130209faf..95d43bcd233 100644 --- a/library/web_infrastructure/htpasswd +++ b/library/web_infrastructure/htpasswd @@ -211,7 +211,7 @@ def main(): module.fail_json(msg=str(e)) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * if __name__ == '__main__': diff --git a/library/web_infrastructure/jboss b/library/web_infrastructure/jboss index b936294bbcb..9478235698c 100644 --- a/library/web_infrastructure/jboss +++ b/library/web_infrastructure/jboss @@ -135,6 +135,6 @@ def main(): module.exit_json(changed=changed) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main() diff --git a/library/web_infrastructure/supervisorctl b/library/web_infrastructure/supervisorctl index b8586d2361b..564368af5f4 100644 --- a/library/web_infrastructure/supervisorctl +++ b/library/web_infrastructure/supervisorctl @@ -189,7 +189,7 @@ def main(): module.exit_json(changed=False, name=name, state=state) -# this is magic, see lib/ansible/module_common.py +# import module snippets from ansible.module_utils.basic import * main()