iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6183 from mayn/fix-docs-links 

docs: (triton / alicloud-ecs) minor fix for links that aren't being rendered and incorrect datatype documented
This commit is contained in:
M. Marsh 2018-04-24 15:56:00 -07:00 committed by GitHub
parent 52df315ca9 540a6a29f4
commit 9323139bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/source/docs/builders/alicloud-ecs.html.md
View File

@ -67,7 +67,7 @@ builder.
limit of 0 to 256 characters. Leaving it blank means null, which is the limit of 0 to 256 characters. Leaving it blank means null, which is the
default value. It cannot begin with `http://` or `https://`. default value. It cannot begin with `http://` or `https://`.
-   `image_disk_mappings` (array of image disk mappings) - Add one or more data disks - `image_disk_mappings` (array of image disk mappings) - Add one or more data disks
to the image. to the image.
- `disk_category` (string) - Category of the data disk. Optional values are: - `disk_category` (string) - Category of the data disk. Optional values are:
@ -77,7 +77,7 @@ builder.
Default value: cloud. Default value: cloud.
- `disk_delete_with_instance` (string) - Whether or not the disk is released along with the instance: - `disk_delete_with_instance` (boolean) - Whether or not the disk is released along with the instance:
- True indicates that when the instance is released, this disk will be released with it - True indicates that when the instance is released, this disk will be released with it
- False indicates that when the instance is released, this disk will be retained. - False indicates that when the instance is released, this disk will be retained.

1
website/source/docs/builders/triton.html.md
View File

@ -50,6 +50,7 @@ builder.
- `triton_account` (string) - The username of the Triton account to use when - `triton_account` (string) - The username of the Triton account to use when
using the Triton Cloud API. using the Triton Cloud API.
- `triton_key_id` (string) - The fingerprint of the public key of the SSH key - `triton_key_id` (string) - The fingerprint of the public key of the SSH key
pair to use for authentication with the Triton Cloud API. If pair to use for authentication with the Triton Cloud API. If
`triton_key_material` is not set, it is assumed that the SSH agent has the `triton_key_material` is not set, it is assumed that the SSH agent has the