Merge pull request #667 from sivel/extras-fixes

Extras module fix-ups

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()

cloud/webfaction/webfaction_app.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python
 #
 # Create a Webfaction application using Ansible and the Webfaction API
 #

cloud/webfaction/webfaction_db.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python
 #
 # Create a webfaction database using Ansible and the Webfaction API
 #

cloud/webfaction/webfaction_domain.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python
 #
 # Create Webfaction domains and subdomains using Ansible and the Webfaction API
 #

cloud/webfaction/webfaction_mailbox.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python
 #
 # Create webfaction mailbox using Ansible and the Webfaction API
 #

cloud/webfaction/webfaction_site.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python
 #
 # Create Webfaction website using Ansible and the Webfaction API
 #

database/misc/mongodb_user.py

@@ -225,10 +225,10 @@ def main():
     update_password = module.params['update_password']
 
     try:
-    	if replica_set:
-    	   client = MongoClient(login_host, int(login_port), replicaset=replica_set, ssl=ssl)
-    	else:
-    	   client = MongoClient(login_host, int(login_port), ssl=ssl)
+        if replica_set:
+            client = MongoClient(login_host, int(login_port), replicaset=replica_set, ssl=ssl)
+        else:
+            client = MongoClient(login_host, int(login_port), ssl=ssl)
 
         if login_user is None and login_password is None:
             mongocnf_creds = load_mongocnf()