From 43687f1940e23a8e62eb87e76572845b268f5260 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 11 May 2015 10:09:56 -0700 Subject: [PATCH] Update module documentation if modules have a dep on python2.6+ --- lib/ansible/modules/extras/cloud/amazon/cloudtrail.py | 4 +++- lib/ansible/modules/extras/cloud/google/gce_img.py | 4 +++- lib/ansible/modules/extras/cloud/lxc/lxc_container.py | 5 ++++- lib/ansible/modules/extras/cloud/misc/ovirt.py | 4 +++- lib/ansible/modules/extras/cloud/misc/virt.py | 4 +++- lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py | 1 + 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/amazon/cloudtrail.py b/lib/ansible/modules/extras/cloud/amazon/cloudtrail.py index b58bcd6e1d0..312b9b08c9c 100755 --- a/lib/ansible/modules/extras/cloud/amazon/cloudtrail.py +++ b/lib/ansible/modules/extras/cloud/amazon/cloudtrail.py @@ -19,9 +19,11 @@ DOCUMENTATION = """ module: cloudtrail short_description: manage CloudTrail creation and deletion description: - - Creates or deletes CloudTrail configuration. Ensures logging is also enabled. This module has a dependency on python-boto >= 2.21. + - Creates or deletes CloudTrail configuration. Ensures logging is also enabled. version_added: "2.0" author: Ted Timmons +requirements: + - "boto >= 2.21" options: state: description: diff --git a/lib/ansible/modules/extras/cloud/google/gce_img.py b/lib/ansible/modules/extras/cloud/google/gce_img.py index 3b2351b3752..ae4c31dc4c5 100644 --- a/lib/ansible/modules/extras/cloud/google/gce_img.py +++ b/lib/ansible/modules/extras/cloud/google/gce_img.py @@ -78,7 +78,9 @@ options: default: null aliases: [] -requirements: [ "libcloud" ] +requirements: + - "python >= 2.6" + - "apache-libcloud" author: Peter Tan ''' diff --git a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py b/lib/ansible/modules/extras/cloud/lxc/lxc_container.py index 5f0f6bb2ad6..7e718608287 100644 --- a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py +++ b/lib/ansible/modules/extras/cloud/lxc/lxc_container.py @@ -149,7 +149,10 @@ options: description: - list of 'key=value' options to use when configuring a container. required: false -requirements: ['lxc >= 1.0', 'python2-lxc >= 0.1'] +requirements: + - 'lxc >= 1.0' + - 'python >= 2.6' + - 'python2-lxc >= 0.1' notes: - Containers must have a unique name. If you attempt to create a container with a name that already exists in the users namespace the module will diff --git a/lib/ansible/modules/extras/cloud/misc/ovirt.py b/lib/ansible/modules/extras/cloud/misc/ovirt.py index 2d54ad3f401..258637ddaec 100755 --- a/lib/ansible/modules/extras/cloud/misc/ovirt.py +++ b/lib/ansible/modules/extras/cloud/misc/ovirt.py @@ -152,7 +152,9 @@ options: aliases: [] choices: ['present', 'absent', 'shutdown', 'started', 'restarted'] -requirements: [ "ovirt-engine-sdk" ] +requirements: + - "python >= 2.6" + - "ovirt-engine-sdk-python" ''' EXAMPLES = ''' # Basic example provisioning from image. diff --git a/lib/ansible/modules/extras/cloud/misc/virt.py b/lib/ansible/modules/extras/cloud/misc/virt.py index f1d36fc1964..a2567f586a9 100644 --- a/lib/ansible/modules/extras/cloud/misc/virt.py +++ b/lib/ansible/modules/extras/cloud/misc/virt.py @@ -55,7 +55,9 @@ options: - XML document used with the define command required: false default: null -requirements: [ "libvirt" ] +requirements: + - "python >= 2.6" + - "libvirt-python" author: Michael DeHaan, Seth Vidal ''' diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py index 35cf7fa4692..10a6f493bf8 100644 --- a/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py +++ b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py @@ -29,6 +29,7 @@ author: Joseph Callen notes: - Tested on vSphere 5.5 requirements: + - "python >= 2.6" - PyVmomi options: hostname: