cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing up some docstrings causing make webdocs to fail

Browse source
This commit is contained in:
James Cammarata 2014-03-11 12:26:35 -05:00
parent 998b986c59
commit b95fe470c4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/cloud/ec2_ami_search
View file

@ -26,7 +26,8 @@ description:
- Returns C(ami), C(aki), C(ari), C(serial), C(tag) - Returns C(ami), C(aki), C(ari), C(serial), C(tag)
- If there is no AKI or ARI associated with an image, these will be C(null). - If there is no AKI or ARI associated with an image, these will be C(null).
- Only supports images from cloud-images.ubuntu.com - Only supports images from cloud-images.ubuntu.com
- Example output: C({"ami": "ami-69f5a900", "changed": false, "aki": "aki-88aa75e1", "tag": "release", "ari": null, "serial": "20131024"}) - 'Example output: C({"ami": "ami-69f5a900", "changed": false, "aki": "aki-88aa75e1", "tag": "release", "ari": null, "serial": "20131024"})'
version_added: "1.6"
options: options:
distro: distro:
description: Linux distribution (e.g., C(ubuntu)) description: Linux distribution (e.g., C(ubuntu))

2
library/cloud/s3
View file

@ -68,7 +68,7 @@ options:
aliases: [] aliases: []
s3_url: s3_url:
description: description:
- S3 URL endpoint. If not specified then the S3_URL environment variable is used, if that variable is defined. Ansible tries to guess if fakes3 (https://github.com/jubos/fake-s3) or Eucalyptus Walrus (https://github.com/eucalyptus/eucalyptus/wiki/Walrus) is used and configure connection accordingly. Current heuristic is: everything with scheme fakes3:// is fakes3, everything else not ending with amazonaws.com is Walrus. - "S3 URL endpoint. If not specified then the S3_URL environment variable is used, if that variable is defined. Ansible tries to guess if fakes3 (https://github.com/jubos/fake-s3) or Eucalyptus Walrus (https://github.com/eucalyptus/eucalyptus/wiki/Walrus) is used and configure connection accordingly. Current heuristic is: everything with scheme fakes3:// is fakes3, everything else not ending with amazonaws.com is Walrus."
default: null default: null
aliases: [ S3_URL ] aliases: [ S3_URL ]
aws_secret_key: aws_secret_key: