From fa48381bd71a8b53af2e115c67a4aba1d23a6d09 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 4 Mar 2020 16:30:03 +0800 Subject: [PATCH] hostman: default ovn options from environment --- pkg/hostman/options/options.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/hostman/options/options.go b/pkg/hostman/options/options.go index e5f6e7394e..0d115dc1ea 100644 --- a/pkg/hostman/options/options.go +++ b/pkg/hostman/options/options.go @@ -111,9 +111,9 @@ type SHostOptions struct { ExecutorSocketPath string `help:"Executor socket path" default:"/var/run/exec.sock"` CommonConfigFile string `help:"common config file for container"` - OvnSouthDatabase string `help:"address for accessing ovn south database" default:"unix:/var/run/openvswitch/ovnsb_db.sock"` - OvnIntegrationBridge string `help:"name of integration bridge for logical ports" default:"brvpc"` - OvnEncapIp string `help:"encap ip for ovn datapath. Default to output src address of default route"` + OvnSouthDatabase string `help:"address for accessing ovn south database" default:"$HOST_OVN_SOUTH_DATABASE|unix:/var/run/openvswitch/ovnsb_db.sock"` + OvnIntegrationBridge string `help:"name of integration bridge for logical ports" default:"brvpc" default:"$HOST_OVN_INTEGRATION_BRIDGE|brvpc"` + OvnEncapIp string `help:"encap ip for ovn datapath. Default to output src address of default route" default:"$HOST_OVN_ENCAP_IP"` } var HostOptions SHostOptions