From ec3b0a51383f16ec522c5ed391ce3fe79232046e Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Fri, 1 Mar 2019 11:13:32 -0800 Subject: [PATCH] fix conflict from mergeing too many things to master at once --- builder/amazon/ebs/builder.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index c1de2e154..0cd29bdce 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -230,12 +230,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe EncryptBootVolume: b.config.AMIEncryptBootVolume, Name: b.config.AMIName, }, - &awscommon.StepCreateEncryptedAMICopy{ - KeyID: b.config.AMIKmsKeyId, - EncryptBootVolume: b.config.AMIEncryptBootVolume, - Name: b.config.AMIName, - AMIMappings: b.config.AMIBlockDevices.AMIMappings, - }, &awscommon.StepModifyAMIAttributes{ Description: b.config.AMIDescription, Users: b.config.AMIUsers,