From 082cff6acd0ee668297ce793d898b6d71ae51f91 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 14 Jan 2019 09:43:34 +0000 Subject: [PATCH] =?UTF-8?q?lbagent:=20=E6=94=B9=E6=AD=A3cloudcommon.Common?= =?UTF-8?q?Options=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/lbagent/main.go | 2 +- pkg/lbagent/api.go | 2 +- pkg/lbagent/options.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/lbagent/main.go b/cmd/lbagent/main.go index 9215a1ece1..1dce0f27f6 100644 --- a/cmd/lbagent/main.go +++ b/cmd/lbagent/main.go @@ -17,7 +17,7 @@ func main() { consts.SetServiceType("lbagent") opts := &lbagent.Options{} - commonOpts := &opts.CommonOpts + commonOpts := &opts.CommonOptions { cloudcommon.ParseOptions(opts, commonOpts, os.Args, "lbagent.conf") cloudcommon.InitAuth(commonOpts, func() { diff --git a/pkg/lbagent/api.go b/pkg/lbagent/api.go index 38866f24a2..d55468c429 100644 --- a/pkg/lbagent/api.go +++ b/pkg/lbagent/api.go @@ -63,7 +63,7 @@ func (h *ApiHelper) Run(ctx context.Context) { } func (h *ApiHelper) adminClientSession(ctx context.Context) *mcclient.ClientSession { - region := h.opts.CommonOpts.Region + region := h.opts.CommonOptions.Region apiVersion := "v2" s := auth.GetAdminSession(ctx, region, apiVersion) return s diff --git a/pkg/lbagent/options.go b/pkg/lbagent/options.go index 11dae1370c..8ac80d5f8e 100644 --- a/pkg/lbagent/options.go +++ b/pkg/lbagent/options.go @@ -31,7 +31,7 @@ type LbagentOptions struct { } type Options struct { - CommonOpts cloudcommon.CommonOptions + cloudcommon.CommonOptions LbagentOptions }