Merge pull request #5006 from yousong/automated-cherry-pick-of-#5005-upstream-release-3.1

Automated cherry pick of #5005: hostman: fix detection of ovn controller version

pkg/hostman/hostinfo/hostinfo.go

@@ -141,8 +141,11 @@ func (h *SHostInfo) Init() error {
 	if err := h.parseConfig(); err != nil {
 		return err
 	}
-	if err := h.setupOvnChassis(); err != nil {
-		return err
+	if HasOvnSupport() {
+		if err := h.setupOvnChassis(); err != nil {
+			return err
+		}
+		return nil
 	}
 	log.Infof("Start detectHostInfo")
 	if err := h.detectHostInfo(); err != nil {

pkg/hostman/hostinfo/hostovn.go

@@ -107,13 +107,21 @@ func (oh *OvnHelper) mustPrepService() {
 }
 
 func MustGetOvnVersion() string {
-	output, err := procutils.NewCommand("ovn-controller", "--version").Output()
+	output, err := procutils.NewRemoteCommandAsFarAsPossible("ovn-controller", "--version").Output()
 	if err != nil {
 		return ""
 	}
 	return ovnExtractVersion(string(output))
 }
 
+func HasOvnSupport() bool {
+	ver := MustGetOvnVersion()
+	if ver != "" {
+		return true
+	}
+	return false
+}
+
 func ovnExtractVersion(in string) string {
 	r := make([]rune, 0, 8)
 	var (