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 'ab6eae05b274abc01be7390e348fea1373c758f9':
  region: server-list add cdrom
This commit is contained in:
邱剑
2018-11-08 19:52:51 +08:00
parent 594a7eb3b7 ab6eae05b2
commit 65541d942d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+5
View File
@@ -1053,6 +1053,11 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T
}
extra.Add(isGpu, "is_gpu")
extra.Add(jsonutils.JSONNull, "cdrom")
if cdrom := self.getCdrom(); cdrom != nil {
extra.Set("cdrom", jsonutils.NewString(cdrom.GetDetails()))
}
return self.moreExtraInfo(extra)
}