Merge branch 'devel' into scheduledTask

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

packaging/language/bundler.py

@@ -40,18 +40,22 @@ options:
     default: present
   chdir:
     description:
-      - The directory to execute the bundler commands from. This directoy needs to contain a valid Gemfile or .bundle/ directory
+      - The directory to execute the bundler commands from. This directoy
+        needs to contain a valid Gemfile or .bundle/ directory
     required: false
     default: temporary working directory
   exclude_groups:
     description:
-      - A list of Gemfile groups to exclude during operations. This only applies when state is C(present). Bundler considers this a 'remembered' 
-      property for the Gemfile and will automatically exclude groups in future operations even if C(exclude_groups) is not set
+      - A list of Gemfile groups to exclude during operations. This only
+        applies when state is C(present). Bundler considers this
+        a 'remembered' property for the Gemfile and will automatically exclude
+        groups in future operations even if C(exclude_groups) is not set
     required: false
     default: null
   clean:
     description:
-      - Only applies if state is C(present). If set removes any gems on the target host that are not in the gemfile
+      - Only applies if state is C(present). If set removes any gems on the
+        target host that are not in the gemfile
     required: false
     choices: [yes, no]
     default: "no"
@@ -68,8 +72,9 @@ options:
     default: "no"
   deployment_mode:
     description:
-      - Only applies if state is C(present). If set it will only install gems that are in the default or production groups. Requires a Gemfile.lock
-      file to have been created prior
+      - Only applies if state is C(present). If set it will only install gems
+        that are in the default or production groups. Requires a Gemfile.lock
+        file to have been created prior
     required: false
     choices: [yes, no]
     default: "no"
@@ -81,19 +86,25 @@ options:
     default: "yes"
   gem_path:
     description:
-      - Only applies if state is C(present). Specifies the directory to install the gems into. If C(chdir) is set then this path is relative to C(chdir)
-      required: false
-      default: RubyGems gem paths
+      - Only applies if state is C(present). Specifies the directory to
+        install the gems into. If C(chdir) is set then this path is relative to
+        C(chdir)
+    required: false
+    default: RubyGems gem paths
   binstub_directory:
     description:
-      - Only applies if state is C(present). Specifies the directory to install any gem bins files to. When executed the bin files will run within
-      the context of the Gemfile and fail if any required gem dependencies are not installed. If C(chdir) is set then this path is relative to C(chdir)
+      - Only applies if state is C(present). Specifies the directory to
+        install any gem bins files to. When executed the bin files will run
+        within the context of the Gemfile and fail if any required gem
+        dependencies are not installed. If C(chdir) is set then this path is
+        relative to C(chdir)
     required: false
     default: null
   extra_args:
     description:
-      - A space separated string of additional commands that can be applied to the Bundler command. Refer to the Bundler documentation for more
-      information
+      - A space separated string of additional commands that can be applied to
+        the Bundler command. Refer to the Bundler documentation for more
+        information
     required: false
     default: null
 author: Tim Hoiberg
@@ -196,4 +207,4 @@ def main():
 
 
 from ansible.module_utils.basic import *
-main()
+main()