From c76062406d9810268fdfaba21121c4dba7970f73 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 27 Feb 2020 19:59:10 +0800 Subject: [PATCH] hostman: resolve ovn db address before setting it into ovsdb --- pkg/hostman/hostinfo/hostovn.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/hostman/hostinfo/hostovn.go b/pkg/hostman/hostinfo/hostovn.go index 502e758bf2..ef3e2b802b 100644 --- a/pkg/hostman/hostinfo/hostovn.go +++ b/pkg/hostman/hostinfo/hostovn.go @@ -22,6 +22,7 @@ import ( "yunion.io/x/onecloud/pkg/hostman/options" "yunion.io/x/onecloud/pkg/hostman/system_service" "yunion.io/x/onecloud/pkg/util/netutils2" + "yunion.io/x/onecloud/pkg/util/ovsutils" "yunion.io/x/onecloud/pkg/util/procutils" ) @@ -80,6 +81,11 @@ func (oh *OvnHelper) mustPrepOvsdbConfig() { if opts.OvnSouthDatabase == "" { panic(errors.Wrap(ErrOvnConfig, "bad config: ovn_south_database")) } + db, err := ovsutils.NormalizeDbHost(opts.OvnSouthDatabase) + if err != nil { + panic(errors.Wrap(err, "normalize db host")) + } + opts.OvnSouthDatabase = db args = append(args, fmt.Sprintf("external_ids:ovn-remote=%s", opts.OvnSouthDatabase)) }