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 #635 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/import-fix to release/2.4.0

Browse Source 
* commit '93100dd3058b65e357fd7175af64eb15f0884329':
  fix import not use and not enough arguments in call
This commit is contained in:
李泽玺
2018-12-01 16:25:39 +08:00
parent f30c79d969 93100dd305
commit b53e7140c5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/azure.go
-1
View File
@@ -16,7 +16,6 @@ import (
"yunion.io/x/pkg/utils"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
pkg/compute/guestdrivers/qcloud.go
+2 -3
View File
@@ -12,7 +12,6 @@ import (
"yunion.io/x/pkg/util/compare"
"yunion.io/x/pkg/utils"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -344,12 +343,12 @@ func (self *SQcloudGuestDriver) RequestSyncConfigOnHost(ctx context.Context, gue
return nil, err
}
for _, disk := range removed {
if err := iVM.DetachDisk(disk.GetId()); err != nil {
if err := iVM.DetachDisk(ctx, disk.GetId()); err != nil {
return nil, err
}
}
for _, disk := range added {
if err := iVM.AttachDisk(disk.ExternalId); err != nil {
if err := iVM.AttachDisk(ctx, disk.ExternalId); err != nil {
return nil, err
}
}