From 224bb78175c4d50051f04ca4dcb922c992ca3ad0 Mon Sep 17 00:00:00 2001 From: Anthony Spring Date: Mon, 29 Jun 2015 17:11:58 -0400 Subject: [PATCH] Make EBS block device mapping optional for ephemeral virtual names. --- builder/amazon/common/block_device.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 482b876f6..48cc4ef27 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -4,6 +4,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mitchellh/packer/template/interpolate" + "strings" ) // BlockDevice @@ -47,9 +48,12 @@ func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping { } mapping := &ec2.BlockDeviceMapping{ - EBS: ebsBlockDevice, - DeviceName: aws.String(blockDevice.DeviceName), - VirtualName: aws.String(blockDevice.VirtualName), + DeviceName: aws.String(blockDevice.DeviceName), + VirtualName: aws.String(blockDevice.VirtualName), + } + + if !strings.HasPrefix(blockDevice.VirtualName, "ephemeral") { + mapping.EBS = ebsBlockDevice } if blockDevice.NoDevice {