Merge pull request #667 from sivel/extras-fixes

Extras module fix-ups
2015-06-30 12:08:27 -07:00 · 2015-06-30 12:08:27 -07:00 · 3573f9b61a
commit 3573f9b61a
parent 0f9ade7fe3 9a36454329
9 changed files with 12 additions and 11 deletions
--- a/cloud/vmware/vsphere_copy.py
+++ b/cloud/vmware/vsphere_copy.py
@ -149,6 +149,7 @@ def main():
    else:
        module.fail_json(msg='Failed to upload', status=resp.status, reason=resp.reason, length=resp.length, version=resp.version, headers=resp.getheaders(), chunked=resp.chunked, url=url)

-# this is magic, see lib/ansible/module_common.py
-#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+# Import module snippets
+from ansible.module_utils.basic import *
+
 main()
--- a/clustering/init.py
+++ b/clustering/init.py
--- a/packaging/dpkg_selections.py
+++ b/packaging/dpkg_selections.py