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

amazon docs: update block-device-configuration docs (#8395) 

So that it works for all builders as some use it with the following field names: launch_block_device_mappings, ami_block_device_mappings or ebs_volumes. the refactored docs weird being to specific.
This commit is contained in:
Mike Dziedziela 2019-11-25 11:58:30 +01:00 committed by Adrien Delorme
parent d317d7f3d1
commit 7c3e032fb7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/amazon/common/block_device.go
View File

@ -22,7 +22,7 @@ import (
// build instance at launch using a specific non-default kms key: // build instance at launch using a specific non-default kms key:
// //
// ``` json // ``` json
// "launch_block_device_mappings": [{ // "[{
// "device_name": "/dev/sda1", // "device_name": "/dev/sda1",
// "encrypted": true, // "encrypted": true,
// "kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d" // "kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
@ -32,9 +32,6 @@ import (
// Documentation for Block Devices Mappings can be found here: // Documentation for Block Devices Mappings can be found here:
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
// //
// These mappings give you control over either the volumes generated for the
// Packer build via `launch_block_device_mappings`, or the volumes that Packer will
// save with the artifact AMI via `ami_block_device_mappings`.
type BlockDevice struct { type BlockDevice struct {
// Indicates whether the EBS volume is deleted on instance termination. // Indicates whether the EBS volume is deleted on instance termination.
// Default false. NOTE: If this value is not explicitly set to true and // Default false. NOTE: If this value is not explicitly set to true and

6
website/source/partials/builder/amazon/common/_BlockDevice.html.md
View File

@ -8,7 +8,7 @@ The following mapping will tell Packer to encrypt the root volume of the
build instance at launch using a specific non-default kms key: build instance at launch using a specific non-default kms key:
``` json ``` json
"launch_block_device_mappings": [{ "[{
"device_name": "/dev/sda1", "device_name": "/dev/sda1",
"encrypted": true, "encrypted": true,
"kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d" "kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
@ -17,7 +17,3 @@ build instance at launch using a specific non-default kms key:
Documentation for Block Devices Mappings can be found here: Documentation for Block Devices Mappings can be found here:
https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
These mappings give you control over either the volumes generated for the
Packer build via `launch_block_device_mappings`, or the volumes that Packer will
save with the artifact AMI via `ami_block_device_mappings`.