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 #8847 from wanyaoqi/bugfix/wyq/fix-order-init-host-service

Browse Source 
host: fix order init host srevice
This commit is contained in:
Zexi Li
2020-11-19 12:50:07 +08:00
committed by GitHub
parent 7391c6e1f6 cbb801753b
commit 24bbbb4b0a
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostinfo/hostinfo.go
+18 -9
View File
@@ -148,10 +148,28 @@ func (h *SHostInfo) IsHugepagesEnabled() bool {
return h.enableHugePages || options.HostOptions.HugepagesOption == "native"
}
/* In this order init host service:
* 1. prepare env, fix environment variable path
* 2. detect hostinfo, fill host capability and custom host field
* 3. prepare hostbridge, start openvswitch service
* 4. parse host config, config ip address
* 5. check is ovn support, setup ovn chassis
*/
func (h *SHostInfo) Init() error {
if err := h.prepareEnv(); err != nil {
return err
}
log.Infof("Start detectHostInfo")
if err := h.detectHostInfo(); err != nil {
return err
}
if err := hostbridge.Prepare(options.HostOptions.BridgeDriver); err != nil {
log.Errorln(err)
return err
}
log.Infof("Start parseConfig")
if err := h.parseConfig(); err != nil {
return err
@@ -162,15 +180,6 @@ func (h *SHostInfo) Init() error {
}
}
log.Infof("Start detectHostInfo")
if err := h.detectHostInfo(); err != nil {
return err
}
if err := hostbridge.Prepare(options.HostOptions.BridgeDriver); err != nil {
log.Errorln(err)
return err
}
return nil
}