From 7fcbdfb945966d4c5a51c9d5807535b83232f3c2 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 25 Jan 2019 14:10:32 +0530 Subject: [PATCH] Fix template to add userID Fix Node server Signed-off-by: Madhu Rajanna --- pkg/cephfs/cephconf.go | 2 +- pkg/cephfs/nodeserver.go | 2 +- pkg/rbd/nodeserver.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cephfs/cephconf.go b/pkg/cephfs/cephconf.go index c340d9f85..9277e63a4 100644 --- a/pkg/cephfs/cephconf.go +++ b/pkg/cephfs/cephconf.go @@ -33,7 +33,7 @@ auth_client_required = cephx fuse_set_user_groups = false ` -const cephKeyring = `[client.{{.UserId}}] +const cephKeyring = `[client.{{.UserID}}] key = {{.Key}} ` diff --git a/pkg/cephfs/nodeserver.go b/pkg/cephfs/nodeserver.go index bb260ac1a..4b6309169 100644 --- a/pkg/cephfs/nodeserver.go +++ b/pkg/cephfs/nodeserver.go @@ -242,6 +242,6 @@ func (ns *NodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetC }, nil } -func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) { +func (ns *NodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) { return ns.DefaultNodeServer.NodeGetInfo(ctx, req) } diff --git a/pkg/rbd/nodeserver.go b/pkg/rbd/nodeserver.go index a5ae52b2d..e5696f5d5 100644 --- a/pkg/rbd/nodeserver.go +++ b/pkg/rbd/nodeserver.go @@ -218,7 +218,7 @@ func (ns *NodeServer) NodeUnstageVolume( return nil, status.Error(codes.Unimplemented, "") } -func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) { +func (ns *NodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) { return ns.DefaultNodeServer.NodeGetInfo(ctx, req) }