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

Merge pull request #520 from ioito/hotfix/qx-openstack-change-flavor

Browse Source 
修正openstack状态
This commit is contained in:
yunion-ci-robot
2019-04-20 19:54:12 +08:00
committed by GitHub
parent 1a80547c27 bda1319d1c
commit e354e771b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/openstack/instance.go
+3 -3
View File
@@ -328,8 +328,8 @@ func (instance *SInstance) GetStatus() string {
case INSTANCE_STATUS_RESIZE:
return api.VM_CHANGE_FLAVOR
case INSTANCE_STATUS_VERIFY_RESIZE:
/// return INSTANCE_STATUS_VERIFY_RESIZE ??? use sync_status instead
return api.VM_SYNCING_STATUS
// API请求更改配置后，会有一个确认的状态，即此状态
return api.VM_CHANGE_FLAVOR
case INSTANCE_STATUS_SHELVED, INSTANCE_STATUS_SHELVED_OFFLOADED, INSTANCE_STATUS_SHUTOFF, INSTANCE_STATUS_SOFT_DELETED:
return api.VM_READY
default:
@@ -448,7 +448,7 @@ func (region *SRegion) ChangeConfig(instance *SInstance, flavorId string) error
if err != nil {
return err
}
if err := cloudprovider.WaitStatus(instance, INSTANCE_STATUS_VERIFY_RESIZE, time.Second*3, time.Minute*4); err != nil {
if err := cloudprovider.WaitStatus(instance, api.VM_CHANGE_FLAVOR, time.Second*3, time.Minute*4); err != nil {
return err
}
return region.instanceOperation(instance.ID, "confirmResize")