From b7c73b89ac0ed3020700474b7bd4e70d22177c9d Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Tue, 17 Jan 2017 21:32:18 -0800 Subject: [PATCH] Propagate block device doc changes to AWS chroot and instance builder docs --- .../source/docs/builders/amazon-chroot.html.md | 10 ++++++---- .../source/docs/builders/amazon-instance.html.md | 16 +++++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/website/source/docs/builders/amazon-chroot.html.md b/website/source/docs/builders/amazon-chroot.html.md index ec426c75a..a58e3ccea 100644 --- a/website/source/docs/builders/amazon-chroot.html.md +++ b/website/source/docs/builders/amazon-chroot.html.md @@ -133,9 +133,11 @@ each category, the available configuration keys are alphabetized. `ami_virtualization_type`, `pre_mount_commands` and `root_volume_size`. The below options are also required in this mode only: -- `ami_block_device_mappings` (array of block device mappings) - Add the block - device mappings to the AMI. A `device_name` entry matching `root_device_name` - should be set. The block device mappings allow for keys: +- `ami_block_device_mappings` (array of block device mappings) - Add one or + more [block device mappings](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) + to the AMI. These will be attached when booting a new instance from your + AMI. Your options here may vary depending on the type of VM you use. The + block device mappings allow for the following configuration: - `delete_on_termination` (boolean) - Indicates whether the EBS volume is deleted on instance termination. Default `false`. **NOTE**: If this @@ -144,7 +146,7 @@ each category, the available configuration keys are alphabetized. every build. - `device_name` (string) - The device name exposed to the instance (for - example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`. + example, `/dev/sdh` or `xvdh`). Required when specifying `volume_size`. - `encrypted` (boolean) - Indicates whether to encrypt the volume or not diff --git a/website/source/docs/builders/amazon-instance.html.md b/website/source/docs/builders/amazon-instance.html.md index af869f808..5ce36610e 100644 --- a/website/source/docs/builders/amazon-instance.html.md +++ b/website/source/docs/builders/amazon-instance.html.md @@ -85,8 +85,13 @@ builder. ### Optional: -- `ami_block_device_mappings` (array of block device mappings) - Add the block - device mappings to the AMI. The block device mappings allow for keys: +- `ami_block_device_mappings` (array of block device mappings) - Add one or + more [block device mappings](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) + to the AMI. These will be attached when booting a new instance from your + AMI. To add a block device during the packer build see + `launch_block_device_mappings` below. Your options here may vary depending + on the type of VM you use. The block device mappings allow for the following + configuration: - `delete_on_termination` (boolean) - Indicates whether the EBS volume is deleted on instance termination. Default `false`. **NOTE**: If this @@ -186,9 +191,10 @@ builder. profile](https://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html) to launch the EC2 instance with. -- `launch_block_device_mappings` (array of block device mappings) - Add the - block device mappings to the launch instance. The block device mappings are - the same as `ami_block_device_mappings` above. +- `launch_block_device_mappings` (array of block device mappings) - Add one or + more block devices before the packer build starts. These are not necessarily + preserved when booting from the AMI built with packer. See + `ami_block_device_mappings`, above, for details. - `run_tags` (object of key/value strings) - Tags to apply to the instance that is *launched* to create the AMI. These tags are *not* applied to the