iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict from mergeing too many things to master at once

This commit is contained in:
Megan Marsh 2019-03-01 11:13:32 -08:00
parent 34a0edccbb
commit ec3b0a5138
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/amazon/ebs/builder.go
View File

@ -230,12 +230,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
EncryptBootVolume: b.config.AMIEncryptBootVolume, EncryptBootVolume: b.config.AMIEncryptBootVolume,
Name: b.config.AMIName, 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{ &awscommon.StepModifyAMIAttributes{
Description: b.config.AMIDescription, Description: b.config.AMIDescription,
Users: b.config.AMIUsers, Users: b.config.AMIUsers,