From 8a581ec6c050cc8ed36e1bbde0863669a375ed41 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 12 Aug 2020 16:58:28 +0530 Subject: [PATCH] rbd: fix build issue for rbd merging of https://github.com/ceph/ceph-csi/pull/1035 broken the cephcsi building. This commits fixes the build issue. Signed-off-by: Madhu Rajanna --- internal/rbd/rbd_util.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 32b494ba9..54515f282 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -553,7 +553,7 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str } rbdSnap.JournalPool = rbdSnap.Pool - rbdSnap.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdSnap.ClusterID) + rbdSnap.RadosNamespace, err = util.RadosNamespace(util.CsiConfigFile, rbdSnap.ClusterID) if err != nil { return err } @@ -626,7 +626,7 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials, } rbdVol.JournalPool = rbdVol.Pool - rbdVol.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdVol.ClusterID) + rbdVol.RadosNamespace, err = util.RadosNamespace(util.CsiConfigFile, rbdVol.ClusterID) if err != nil { return nil, err } @@ -710,7 +710,7 @@ func genVolFromVolumeOptions(ctx context.Context, volOptions, credentials map[st return nil, err } - rbdVol.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdVol.ClusterID) + rbdVol.RadosNamespace, err = util.RadosNamespace(util.CsiConfigFile, rbdVol.ClusterID) if err != nil { return nil, err }