mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: move csiconfigfile to util

Browse Source 
as we have csiconfigfile in both cephfs
and rbd moving the configfile path to
util folder.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2020-08-10 11:49:38 +05:30
committed by mergify[bot]
parent 35c5afcd3e
commit 18f4e9d519
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/rbd/driver.go
View File

@ -29,9 +29,6 @@ import (
const (
// volIDVersion is the version number of volume ID encoding scheme
volIDVersion uint16 = 1
// csiConfigFile is the location of the CSI config file
csiConfigFile = "/etc/ceph-csi-config/config.json"
)
// Driver contains the default identity,node and controller struct.

2
internal/rbd/rbd_util.go
View File

@ -671,7 +671,7 @@ func getMonsAndClusterID(ctx context.Context, options map[string]string) (monito
return
}
if monitors, err = util.Mons(csiConfigFile, clusterID); err != nil {
if monitors, err = util.Mons(util.CsiConfigFile, clusterID); err != nil {
klog.Errorf(util.Log(ctx, "failed getting mons (%s)"), err)
err = fmt.Errorf("failed to fetch monitor list using clusterID (%s): %w", clusterID, err)
return