Automatic merge from release/2.3.0 -> release/2.4.0

* commit '9c91085004c951b0efecd90c974a6024ee65a540':
  避免调度到Azure经典类型主机上
This commit is contained in:
邱剑
2018-11-10 15:30:31 +08:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -1043,6 +1043,7 @@ func (self *SHost) syncWithCloudHost(extHost cloudprovider.ICloudHost) error {
self.ManagerId = extHost.GetManagerId()
self.IsEmulated = extHost.IsEmulated()
self.Enabled = extHost.GetEnabled()
return nil
})
+1 -1
View File
@@ -73,7 +73,7 @@ func (self *SClassicHost) GetMemSizeMB() int {
return 0
}
func (self *SClassicHost) GetEnabled() bool {
return true
return false
}
func (self *SClassicHost) GetHostStatus() string {