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

Merge pull request #10490 from marinsalinas/master 

fix: [bsusurrogate] override bsu when omi root device is set
This commit is contained in:
Megan Marsh 2021-01-15 15:55:23 -08:00 committed by GitHub
parent a9c4c056c9 170286a427
commit 94e22e6664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/osc/bsusurrogate/step_register_omi.go
View File

@ -114,7 +114,7 @@ func (s *StepRegisterOMI) Cleanup(state multistep.StateBag) {
}
}
func (s *StepRegisterOMI) combineDevices(snapshotIds map[string]string) []osc.BlockDeviceMappingImage {
func (s *StepRegisterOMI) combineDevices(snapshotIDs map[string]string) []osc.BlockDeviceMappingImage {
devices := map[string]osc.BlockDeviceMappingImage{}
for _, device := range s.OMIDevices {
@ -125,12 +125,20 @@ func (s *StepRegisterOMI) combineDevices(snapshotIds map[string]string) []osc.Bl
// the same name in ami_block_device_mappings, except for the
// one designated as the root device in ami_root_device
for _, device := range s.LaunchDevices {
snapshotId, ok := snapshotIds[device.DeviceName]
snapshotID, ok := snapshotIDs[device.DeviceName]
if ok {
device.Bsu.SnapshotId = snapshotId
device.Bsu.SnapshotId = snapshotID
}
if device.DeviceName == s.RootDevice.SourceDeviceName {
device.DeviceName = s.RootDevice.DeviceName
if device.Bsu.VolumeType != "" {
device.Bsu.VolumeType = s.RootDevice.VolumeType
if device.Bsu.VolumeType != "io1" {
device.Bsu.Iops = 0
}
}
}
devices[device.DeviceName] = copyToDeviceMappingImage(device)
}