monior docfixes added extensino to vsphere_copy so it actually installs

This commit is contained in:
Brian Coca 2015-06-19 11:04:25 -04:00 committed by Matt Clay
parent 4588a4f9ed
commit c73d248ba6
4 changed files with 8 additions and 11 deletions

View file

@ -20,24 +20,21 @@ module: ec2_ami_copy
short_description: copies AMI between AWS regions, return new image id short_description: copies AMI between AWS regions, return new image id
description: description:
- Copies AMI from a source region to a destination region. This module has a dependency on python-boto >= 2.5 - Copies AMI from a source region to a destination region. This module has a dependency on python-boto >= 2.5
version_added: "1.7" version_added: "2.0"
options: options:
source_region: source_region:
description: description:
- the source region that AMI should be copied from - the source region that AMI should be copied from
required: true required: true
default: null
region: region:
description: description:
- the destination region that AMI should be copied to - the destination region that AMI should be copied to
required: true required: true
default: null
aliases: ['aws_region', 'ec2_region', 'dest_region'] aliases: ['aws_region', 'ec2_region', 'dest_region']
source_image_id: source_image_id:
description: description:
- the id of the image in source region that should be copied - the id of the image in source region that should be copied
required: true required: true
default: null
name: name:
description: description:
- The name of the new image to copy - The name of the new image to copy

View file

@ -25,13 +25,13 @@ options:
eni_id: eni_id:
description: description:
- The ID of the ENI - The ID of the ENI
required = false required: false
default = null default: null
instance_id: instance_id:
description: description:
- Instance ID that you wish to attach ENI to. To detach an ENI from an instance, use 'None'. - Instance ID that you wish to attach ENI to. To detach an ENI from an instance, use 'None'.
required: false required: false
default: null default: null
private_ip_address: private_ip_address:
description: description:
- Private IP address. - Private IP address.

View file

@ -25,8 +25,8 @@ options:
eni_id: eni_id:
description: description:
- The ID of the ENI. Pass this option to gather facts about a particular ENI, otherwise, all ENIs are returned. - The ID of the ENI. Pass this option to gather facts about a particular ENI, otherwise, all ENIs are returned.
required = false required: false
default = null default: null
extends_documentation_fragment: aws extends_documentation_fragment: aws
''' '''

View file

@ -55,8 +55,8 @@ options:
- The file to push to the datastore on the vCenter server. - The file to push to the datastore on the vCenter server.
required: true required: true
notes: notes:
- This module ought to be run from a system that can access vCenter directly and has the file to transfer. - "This module ought to be run from a system that can access vCenter directly and has the file to transfer.
It can be the normal remote target or you can change it either by using C(transport: local) or using C(delegate_to). It can be the normal remote target or you can change it either by using C(transport: local) or using C(delegate_to)."
- Tested on vSphere 5.5 - Tested on vSphere 5.5
''' '''