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

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit 'e9ce0dee68e059a52e33ed70efdb88904f7d4f65':
  修正：aliyun磁盘创建后，将image external id同步为template id，导致找不到对应的image，导致启动失败
This commit is contained in:
邱剑
2018-11-15 10:22:43 +08:00
parent 41bcde8219 e9ce0dee68
commit 56a65cc909
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/aliyun.go
+1 -1
View File
@@ -458,7 +458,7 @@ func (self *SAliyunGuestDriver) OnGuestDeployTaskDataReceived(ctx context.Contex
if diskInfo[i].AutoDelete {
disk.AutoDelete = true
}
disk.TemplateId = diskInfo[i].TemplateId
// disk.TemplateId = diskInfo[i].TemplateId
disk.DiskFormat = diskInfo[i].DiskFormat
disk.ExpiredAt = diskInfo[i].ExpiredAt
if len(diskInfo[i].Metadata) > 0 {
pkg/compute/guestdrivers/azure.go
+1 -1
View File
@@ -244,7 +244,7 @@ func (self *SAzureGuestDriver) OnGuestDeployTaskDataReceived(ctx context.Context
disk.BillingType = diskInfo[i].BillingType
disk.FsFormat = diskInfo[i].FsFromat
disk.AutoDelete = diskInfo[i].AutoDelete
disk.TemplateId = diskInfo[i].TemplateId
// disk.TemplateId = diskInfo[i].TemplateId
disk.DiskFormat = diskInfo[i].DiskFormat
disk.ExpiredAt = diskInfo[i].ExpiredAt
if len(diskInfo[i].Metadata) > 0 {