From 4c5df7922203a6ed14b7854b28f2a6a3bff00406 Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Tue, 24 Oct 2017 23:22:50 +0200 Subject: [PATCH] Fix regressions introduced in the instance builder Related to #5504 --- builder/amazon/instance/builder.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index ebc93751e..bd534599b 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -198,7 +198,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe if b.config.SpotPrice == "" || b.config.SpotPrice == "0" { instanceStep = &awscommon.StepRunSourceInstance{ Debug: b.config.PackerDebug, - ExpectedRootDevice: "ebs", InstanceType: b.config.InstanceType, UserData: b.config.UserData, UserDataFile: b.config.UserDataFile, @@ -211,12 +210,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe BlockDevices: b.config.BlockDevices, Tags: b.config.RunTags, Ctx: b.config.ctx, - InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior, } } else { instanceStep = &awscommon.StepRunSpotInstance{ Debug: b.config.PackerDebug, - ExpectedRootDevice: "ebs", SpotPrice: b.config.SpotPrice, SpotPriceProduct: b.config.SpotPriceAutoProduct, InstanceType: b.config.InstanceType, @@ -231,7 +228,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe BlockDevices: b.config.BlockDevices, Tags: b.config.RunTags, Ctx: b.config.ctx, - InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior, } }