From 2496a12833dc22553bfea172336c99f37164b236 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 26 Feb 2020 19:55:57 +0800 Subject: [PATCH] vpcagent: resolve ovn db address at args validation time Until we find a reliable way to get k8s svc dns name --- pkg/vpcagent/options/options.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/vpcagent/options/options.go b/pkg/vpcagent/options/options.go index 17a96fbc91..65bc038bd4 100644 --- a/pkg/vpcagent/options/options.go +++ b/pkg/vpcagent/options/options.go @@ -19,6 +19,7 @@ import ( "yunion.io/x/onecloud/pkg/apis/compute" common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" + "yunion.io/x/onecloud/pkg/util/ovsutils" ) const ( @@ -27,6 +28,7 @@ const ( const ( ErrInvalidVpcProvider = errors.Error("invalid vpc provider") + ErrInvalidOvnDatabase = errors.Error("invalid ovn database") ) type VpcAgentOptions struct { @@ -64,5 +66,11 @@ func (opts *Options) ValidateThenInit() error { if opts.OvnWorkerCheckInterval <= 60 { opts.OvnWorkerCheckInterval = 60 } + + if db, err := ovsutils.NormalizeDbHost(opts.OvnNorthDatabase); err != nil { + return err + } else { + opts.OvnNorthDatabase = db + } return nil }