Merge pull request #2289 from mitchellh/b-amazon-chroot-fixes

builder/amazon-chroot: various fixing and debugging of chroot builder

builder/amazon/chroot/builder.go

@@ -34,6 +34,7 @@ type Config struct {
 	DevicePath     string     `mapstructure:"device_path"`
 	MountPath      string     `mapstructure:"mount_path"`
 	SourceAmi      string     `mapstructure:"source_ami"`
+	RootVolumeSize int64      `mapstructure:"root_volume_size"`
 
 	ctx interpolate.Context
 }
@@ -159,7 +160,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepCheckRootDevice{},
 		&StepFlock{},
 		&StepPrepareDevice{},
-		&StepCreateVolume{},
+		&StepCreateVolume{
+			RootVolumeSize: b.config.RootVolumeSize,
+		},
 		&StepAttachVolume{},
 		&StepEarlyUnflock{},
 		&StepMountDevice{},
@@ -172,7 +175,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			ForceDeregister: b.config.AMIForceDeregister,
 			AMIName:         b.config.AMIName,
 		},
-		&StepRegisterAMI{},
+		&StepRegisterAMI{
+			RootVolumeSize: b.config.RootVolumeSize,
+		},
 		&awscommon.StepAMIRegionCopy{
 			AccessConfig: &b.config.AccessConfig,
 			Regions:      b.config.AMIRegions,

builder/amazon/chroot/step_create_volume.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
@@ -17,6 +19,7 @@ import (
 //   volume_id string - The ID of the created volume
 type StepCreateVolume struct {
 	volumeId       string
+	RootVolumeSize int64
 }
 
 func (s *StepCreateVolume) Run(state multistep.StateBag) multistep.StepAction {
@@ -29,7 +32,7 @@ func (s *StepCreateVolume) Run(state multistep.StateBag) multistep.StepAction {
 	log.Printf("Searching for root device of the image (%s)", *image.RootDeviceName)
 	var rootDevice *ec2.BlockDeviceMapping
 	for _, device := range image.BlockDeviceMappings {
-		if device.DeviceName == image.RootDeviceName {
+		if *device.DeviceName == *image.RootDeviceName {
 			rootDevice = device
 			break
 		}
@@ -43,14 +46,18 @@ func (s *StepCreateVolume) Run(state multistep.StateBag) multistep.StepAction {
 	}
 
 	ui.Say("Creating the root volume...")
+	vs := *rootDevice.EBS.VolumeSize
+	if s.RootVolumeSize > *rootDevice.EBS.VolumeSize {
+		vs = s.RootVolumeSize
+	}
 	createVolume := &ec2.CreateVolumeInput{
 		AvailabilityZone: instance.Placement.AvailabilityZone,
-		Size:             rootDevice.EBS.VolumeSize,
+		Size:             aws.Long(vs),
 		SnapshotID:       rootDevice.EBS.SnapshotID,
 		VolumeType:       rootDevice.EBS.VolumeType,
 		IOPS:             rootDevice.EBS.IOPS,
 	}
-	log.Printf("Create args: %#v", createVolume)
+	log.Printf("Create args: %s", awsutil.StringValue(createVolume))
 
 	createVolumeResp, err := ec2conn.CreateVolume(createVolume)
 	if err != nil {

builder/amazon/chroot/step_instance_info.go

@@ -49,7 +49,7 @@ func (s *StepInstanceInfo) Run(state multistep.StateBag) multistep.StepAction {
 		return multistep.ActionHalt
 	}
 
-	instance := &instancesResp.Reservations[0].Instances[0]
+	instance := instancesResp.Reservations[0].Instances[0]
 	state.Put("instance", instance)
 
 	return multistep.ActionContinue

builder/amazon/chroot/step_register_ami.go

@@ -11,7 +11,9 @@ import (
 )
 
 // StepRegisterAMI creates the AMI.
-type StepRegisterAMI struct{}
+type StepRegisterAMI struct {
+	RootVolumeSize int64
+}
 
 func (s *StepRegisterAMI) Run(state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
@@ -24,14 +26,24 @@ func (s *StepRegisterAMI) Run(state multistep.StateBag) multistep.StepAction {
 	blockDevices := make([]*ec2.BlockDeviceMapping, len(image.BlockDeviceMappings))
 	for i, device := range image.BlockDeviceMappings {
 		newDevice := device
-		if newDevice.DeviceName == image.RootDeviceName {
+		if *newDevice.DeviceName == *image.RootDeviceName {
 			if newDevice.EBS != nil {
-				newDevice.EBS.SnapshotID = &snapshotId
+				newDevice.EBS.SnapshotID = aws.String(snapshotId)
 			} else {
-				newDevice.EBS = &ec2.EBSBlockDevice{SnapshotID: &snapshotId}
+				newDevice.EBS = &ec2.EBSBlockDevice{SnapshotID: aws.String(snapshotId)}
+			}
+
+			if s.RootVolumeSize > *newDevice.EBS.VolumeSize {
+				newDevice.EBS.VolumeSize = aws.Long(s.RootVolumeSize)
 			}
 		}
 
+		// assume working from a snapshot, so we unset the Encrypted field if set,
+		// otherwise AWS API will return InvalidParameter
+		if newDevice.EBS != nil && newDevice.EBS.Encrypted != nil {
+			newDevice.EBS.Encrypted = nil
+		}
+
 		blockDevices[i] = newDevice
 	}
 
@@ -82,7 +94,11 @@ func buildRegisterOpts(config *Config, image *ec2.Image, blockDevices []*ec2.Blo
 		Architecture:        image.Architecture,
 		RootDeviceName:      image.RootDeviceName,
 		BlockDeviceMappings: blockDevices,
-		VirtualizationType:  &config.AMIVirtType,
+		VirtualizationType:  image.VirtualizationType,
+	}
+
+	if config.AMIVirtType != "" {
+		registerOpts.VirtualizationType = aws.String(config.AMIVirtType)
 	}
 
 	if config.AMIVirtType != "hvm" {

website/source/docs/builders/amazon-chroot.html.markdown

@@ -133,6 +133,9 @@ AMI if one with the same name already exists. Default `false`.
   template where the `.Device` variable is replaced with the name of the
   device where the volume is attached.
 
+* `root_volume_size` (integer) – The size of the root volume for the chroot
+environment, and the resulting AMI
+
 * `tags` (object of key/value strings) - Tags applied to the AMI.
 
 ## Basic Example