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.2.0 -> release/2.3.0

Browse Source 
* commit 'fed89b0db657f39fc4b8908f2edf4382f7e1dcd5':
This commit is contained in:
邱剑
2018-10-11 15:48:47 +08:00
parent cc7bd6a101 fed89b0db6
commit 6bbcf3ef8b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/azure/instance.go
+8 -7
View File
@@ -69,12 +69,13 @@ type ManagedDiskParameters struct {
}
type DataDisk struct {
Lun int32
Name string
Vhd VirtualHardDisk
Caching CachingTypes
DiskSizeGB int32
ManagedDisk ManagedDiskParameters
Lun int32
Name string
Vhd VirtualHardDisk
Caching CachingTypes
DiskSizeGB int32
CreateOption string
ManagedDisk ManagedDiskParameters
}
type StorageProfile struct {
@@ -375,7 +376,7 @@ func (region *SRegion) AttachDisk(instanceId, diskId string) error {
}
dataDisks = append(dataDisks, compute.DataDisk{
Lun: &_disk.Lun,
CreateOption: compute.DiskCreateOptionTypesAttach,
CreateOption: compute.DiskCreateOptionTypes(_disk.CreateOption),
ManagedDisk: &compute.ManagedDiskParameters{
ID: &_disk.ManagedDisk.ID,
},