opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1217 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-server-create-with-disk to release/2.5.0

Browse Source 
* commit 'aea7a72abe703dfdd77c5ad2aab09583f064a62d':
  修复2.5未自动合并2.4代码更改
This commit is contained in:
邱剑
2019-03-11 18:28:42 +08:00
parent a291bd6878 aea7a72abe
commit 8dacd50d0e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+1 -1
View File
@@ -2507,7 +2507,7 @@ func (self *SGuest) importDisks(ctx context.Context, userCred mcclient.TokenCred
return httperrors.NewInputParameterError("Empty import disks")
}
for _, disk := range disks {
disk, err := self.createDiskOnHost(ctx, userCred, self.GetHost(), disk.ToDiskConfig(), nil, true)
disk, err := self.createDiskOnHost(ctx, userCred, self.GetHost(), disk.ToDiskConfig(), nil, true, true)
if err != nil {
return err
}