diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go index 43d14cdf..9aeb6438 100644 --- a/api/loxinlp/nlp.go +++ b/api/loxinlp/nlp.go @@ -1551,8 +1551,6 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH { nNl.IMap = make(map[string]Intf) checkInit := make(chan bool) - go NlpGet(checkInit) - done := <-checkInit err := nlp.LinkSubscribe(nNl.FromLUCh, nNl.FromLUDone) if err != nil { @@ -1582,6 +1580,9 @@ func NlpInit(bgpPeerMode bool, blackList string) *NlH { go NLWorker(nNl, bgpPeerMode) tk.LogIt(tk.LogInfo, "[NLP] NLP Subscription done\n") + go NlpGet(checkInit) + done := <-checkInit + go LbSessionGet(done) return nNl diff --git a/cicd/common.sh b/cicd/common.sh index ce40e744..79fd9285 100644 --- a/cicd/common.sh +++ b/cicd/common.sh @@ -152,7 +152,9 @@ spawn_docker_host() { $hexec $dname ifconfig lo up $hexec $dname sysctl net.ipv6.conf.all.disable_ipv6=1 2>&1 >> /dev/null #$hexec $dname sysctl net.ipv4.conf.all.arp_accept=1 2>&1 >> /dev/null - $hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null + if [ -f /proc/sys/net/ipv4/conf/eth0/arp_ignore ]; then + $hexec $dname sysctl net.ipv4.conf.eth0.arp_ignore=2 2>&1 >> /dev/null + fi } ## Get loxilb peer docker IP