mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
Merge pull request #5 in ~QIUJIAN/onecloud from ~LIZEXI/onecloud:hotfix/lzx-host-convert-sched-failed to hotfix/qj-host-convert-sched-failed
* commit '1fe2bbe0e0296b58a81004cd1fc64aafe7b179f4': baremetal: host convert failed
This commit is contained in:
@@ -3,7 +3,6 @@ package db
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"yunion.io/x/jsonutils"
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"yunion.io/x/jsonutils"
|
||||
"yunion.io/x/onecloud/pkg/mcclient"
|
||||
"yunion.io/x/pkg/util/timeutils"
|
||||
"yunion.io/x/sqlchemy"
|
||||
|
||||
@@ -401,9 +401,6 @@ func (d *SchedData) fillNetworksInfo(sjson *simplejson.Json) error {
|
||||
if err != nil || net.Idx == "" {
|
||||
net = new(Network)
|
||||
net.Idx = s.Get("network").MustString()
|
||||
if net.Idx == "" {
|
||||
return fmt.Errorf("Invalid network desc: %s", s.MustString())
|
||||
}
|
||||
net.Wire = s.Get("wire").MustString()
|
||||
net.Driver = s.Get("driver").MustString()
|
||||
net.Exit = s.Get("exit").MustBool()
|
||||
|
||||
Reference in New Issue
Block a user