|
|
|
|
@ -1,10 +1,11 @@
|
|
|
|
|
package common
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
|
|
|
"github.com/aws/aws-sdk-go/service/ec2"
|
|
|
|
|
"github.com/mitchellh/packer/template/interpolate"
|
|
|
|
|
"strings"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// BlockDevice
|
|
|
|
|
@ -48,12 +49,12 @@ func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mapping := &ec2.BlockDeviceMapping{
|
|
|
|
|
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
|
|
|
|
|
mapping.EBS = ebsBlockDevice
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if blockDevice.NoDevice {
|
|
|
|
|
|