diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-04-23 02:02:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-23 02:02:42 +0000 |
| commit | a767721c447a624cebdec811795475fd5345b9ff (patch) | |
| tree | 6ef6f81aba957dc4aba1f7311fb1a18cd07c08f0 /src/k8splugin/internal/db | |
| parent | ce36e99a466993bdbbfba8a235db52e565da3340 (diff) | |
| parent | 42f8f006ab01692d7de9cecc06521eaf58743c0d (diff) | |
Merge "Move configuration into config files"
Diffstat (limited to 'src/k8splugin/internal/db')
| -rw-r--r-- | src/k8splugin/internal/db/consul.go | 4 | ||||
| -rw-r--r-- | src/k8splugin/internal/db/mongo.go | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/k8splugin/internal/db/consul.go b/src/k8splugin/internal/db/consul.go index 0977cfba..40028c64 100644 --- a/src/k8splugin/internal/db/consul.go +++ b/src/k8splugin/internal/db/consul.go @@ -14,7 +14,7 @@ limitations under the License. package db import ( - "os" + k8sconfig "k8splugin/internal/config" "github.com/hashicorp/consul/api" pkgerrors "github.com/pkg/errors" @@ -38,7 +38,7 @@ type ConsulStore struct { func NewConsulStore(store ConsulKVStore) (Store, error) { if store == nil { config := api.DefaultConfig() - config.Address = os.Getenv("DATABASE_IP") + ":8500" + config.Address = k8sconfig.GetConfiguration().DatabaseAddress + ":8500" consulClient, err := api.NewClient(config) if err != nil { diff --git a/src/k8splugin/internal/db/mongo.go b/src/k8splugin/internal/db/mongo.go index a9e9d98a..d4525222 100644 --- a/src/k8splugin/internal/db/mongo.go +++ b/src/k8splugin/internal/db/mongo.go @@ -19,7 +19,8 @@ package db import ( "golang.org/x/net/context" "log" - "os" + + "k8splugin/internal/config" pkgerrors "github.com/pkg/errors" "go.mongodb.org/mongo-driver/bson" @@ -76,7 +77,7 @@ var cursorClose = func(ctx context.Context, cursor *mongo.Cursor) error { // If a database with that name exists, it will be returned func NewMongoStore(name string, store *mongo.Database) (Store, error) { if store == nil { - ip := "mongodb://" + os.Getenv("DATABASE_IP") + ":27017" + ip := "mongodb://" + config.GetConfiguration().DatabaseAddress + ":27017" clientOptions := options.Client() clientOptions.ApplyURI(ip) mongoClient, err := mongo.NewClient(clientOptions) |