From 487b7e189b2f3187525048ed0b7bca281084159a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 12 Mar 2020 18:15:30 +0800 Subject: [PATCH] cloudcommon: options: add constants for lock method --- pkg/cloudcommon/database.go | 4 ++-- pkg/cloudcommon/options/options.go | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/database.go b/pkg/cloudcommon/database.go index 061f550649..722842637a 100644 --- a/pkg/cloudcommon/database.go +++ b/pkg/cloudcommon/database.go @@ -53,11 +53,11 @@ func InitDB(options *common_options.DBOptions) { sqlchemy.SetDB(dbConn) switch options.LockmanMethod { - case "inmemory", "": + case common_options.LockMethodInMemory, "": log.Infof("using inmemory lockman") lm := lockman.NewInMemoryLockManager() lockman.Init(lm) - case "etcd": + case common_options.LockMethodEtcd: log.Infof("using etcd lockman") tlsCfg, err := options.GetEtcdTLSConfig() if err != nil { diff --git a/pkg/cloudcommon/options/options.go b/pkg/cloudcommon/options/options.go index bf6e3d137f..114e07dda5 100644 --- a/pkg/cloudcommon/options/options.go +++ b/pkg/cloudcommon/options/options.go @@ -89,6 +89,11 @@ type BaseOptions struct { structarg.BaseOptions } +const ( + LockMethodInMemory = "inmemory" + LockMethodEtcd = "etcd" +) + type CommonOptions struct { AuthURL string `help:"Keystone auth URL" alias:"auth-uri"` AdminUser string `help:"Admin username"`