From 67c337310764d2ea40080cf42db29fa33aaeeae4 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 21 Nov 2019 12:46:31 -0800 Subject: [PATCH] enable no_ephemeral for spot devices, clean up ranging behavior, update docs --- .../amazon/common/step_run_source_instance.go | 5 ++--- .../amazon/common/step_run_spot_instance.go | 21 ++++++++++++++++++- builder/amazon/ebs/builder.go | 14 ++++++++----- .../amazon/ebs/_Config-not-required.html.md | 14 ++++++++----- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 008355330..f55c2d04d 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -127,10 +127,9 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa // don't clutter up console views and cause confusion. log.Printf("no_ephemeral was set, so creating drives xvdca-xvdcz as empty mappings") DefaultEphemeralDeviceLetters := "abcdefghijklmnopqrstuvwxyz" - for i := 0; i < len(DefaultEphemeralDeviceLetters); i++ { - + for _, letter := range DefaultEphemeralDeviceLetters { bd := &ec2.BlockDeviceMapping{ - DeviceName: aws.String("xvdc" + string(DefaultEphemeralDeviceLetters[i])), + DeviceName: aws.String("xvdc" + string(letter)), NoDevice: aws.String(""), } runOpts.BlockDeviceMappings = append(runOpts.BlockDeviceMappings, bd) diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 8cb92baf2..06cb28912 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -41,12 +41,32 @@ type StepRunSpotInstance struct { UserData string UserDataFile string Ctx interpolate.Context + NoEphemeral bool instanceId string } func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string, state multistep.StateBag, marketOptions *ec2.LaunchTemplateInstanceMarketOptionsRequest) *ec2.RequestLaunchTemplateData { + blockDeviceMappings := s.LaunchMappings.BuildEC2BlockDeviceMappings() + if s.NoEphemeral { + // This is only relevant for windows guests. Ephemeral drives by + // default are assigned to drive names xvdca-xvdcz. + // When vms are launched from the AWS console, they're automatically + // removed from the block devices if the user hasn't said to use them, + // but the SDK does not perform this cleanup. The following code just + // manually removes the ephemeral drives from the mapping so that they + // don't clutter up console views and cause confusion. + log.Printf("no_ephemeral was set, so creating drives xvdca-xvdcz as empty mappings") + DefaultEphemeralDeviceLetters := "abcdefghijklmnopqrstuvwxyz" + for _, letter := range DefaultEphemeralDeviceLetters { + bd := &ec2.BlockDeviceMapping{ + DeviceName: aws.String("xvdc" + string(letter)), + NoDevice: aws.String(""), + } + blockDeviceMappings = append(blockDeviceMappings, bd) + } + } // Convert the BlockDeviceMapping into a // LaunchTemplateBlockDeviceMappingRequest. These structs are identical, // except for the EBS field -- on one, that field contains a @@ -55,7 +75,6 @@ func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string, // LaunchTemplateEbsBlockDeviceRequest structs are themselves // identical except for the struct's name, so you can cast one directly // into the other. - blockDeviceMappings := s.LaunchMappings.BuildEC2BlockDeviceMappings() var launchMappingRequests []*ec2.LaunchTemplateBlockDeviceMappingRequest for _, mapping := range blockDeviceMappings { launchRequest := &ec2.LaunchTemplateBlockDeviceMappingRequest{ diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 075ad4621..3e68124c5 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -53,11 +53,15 @@ type Config struct { // engine](/docs/templates/engine.html), see [Build template // data](#build-template-data) for more information. VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"` - // If you set this flag, we'll add clauses to the - // launch_block_device_mappings that make sure ephemeral drives don't show - // up in the EC2 console. If you launched from the EC2 console, you'd get - // this automatically, but the SDK does not provide this service. - // This only applies when you are not running spot instances. + // Relevant only to Windows guests: If you set this flag, we'll add clauses + // to the launch_block_device_mappings that make sure ephemeral drives + // don't show up in the EC2 console. If you launched from the EC2 console, + // you'd get this automatically, but the SDK does not provide this service. + // For more information, see + // https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/InstanceStorage.html. + // Because we don't validate the OS type of your guest, it is up to you to + // make sure you don't set this for *nix guests; behavior may be + // unpredictable. NoEphemeral bool `mapstructure:"no_ephemeral" required:"false"` ctx interpolate.Context diff --git a/website/source/partials/builder/amazon/ebs/_Config-not-required.html.md b/website/source/partials/builder/amazon/ebs/_Config-not-required.html.md index 63e1edafb..d12667551 100644 --- a/website/source/partials/builder/amazon/ebs/_Config-not-required.html.md +++ b/website/source/partials/builder/amazon/ebs/_Config-not-required.html.md @@ -22,9 +22,13 @@ engine](/docs/templates/engine.html), see [Build template data](#build-template-data) for more information. -- `no_ephemeral` (bool) - If you set this flag, we'll add clauses to the - launch_block_device_mappings that make sure ephemeral drives don't show - up in the EC2 console. If you launched from the EC2 console, you'd get - this automatically, but the SDK does not provide this service. - This only applies when you are not running spot instances. +- `no_ephemeral` (bool) - Relevant only to Windows guests: If you set this flag, we'll add clauses + to the launch_block_device_mappings that make sure ephemeral drives + don't show up in the EC2 console. If you launched from the EC2 console, + you'd get this automatically, but the SDK does not provide this service. + For more information, see + https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/InstanceStorage.html. + Because we don't validate the OS type of your guest, it is up to you to + make sure you don't set this for *nix guests; behavior may be + unpredictable. \ No newline at end of file