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

Merge pull request #2912 from wanyaoqi/feature/wyq/fix-init-listen-interface

Browse Source 
bugfix: fix init listen interface
This commit is contained in:
yunion-ci-robot
2019-09-17 00:14:24 +08:00
committed by GitHub
parent 15b50907c9 cc9a458be9
commit 01409c35c9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostinfo/hostinfo.go
+8 -5
View File
@@ -139,11 +139,6 @@ func (h *SHostInfo) parseConfig() error {
if h.GetMemory() < 64 { // MB
return fmt.Errorf("Not enough memory!")
}
if len(options.HostOptions.ListenInterface) > 0 {
h.MasterNic = netutils2.NewNetInterface(options.HostOptions.ListenInterface)
} else {
h.MasterNic = nil
}
for _, n := range options.HostOptions.Networks {
nic, err := NewNIC(n)
if err != nil {
@@ -156,6 +151,14 @@ func (h *SHostInfo) parseConfig() error {
return err
}
}
if len(options.HostOptions.ListenInterface) > 0 {
h.MasterNic = netutils2.NewNetInterface(options.HostOptions.ListenInterface)
if len(h.MasterNic.Addr) == 0 {
return fmt.Errorf("Listen interface %s master not have IP", options.HostOptions.ListenInterface)
}
} else {
h.MasterNic = nil
}
if man, err := isolated_device.NewManager(h); err != nil {
return fmt.Errorf("NewIsolatedManager: %v", err)