mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephfs: CreateVolume() needs ceph config

Browse Source
This commit is contained in:
gman 2018-06-12 17:07:20 +02:00
parent 2fcc252f5c
commit b260bff659
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cephfs/controllerserver.go
View File

@ -77,6 +77,12 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
volId := newVolumeIdentifier(volOptions, req) volId := newVolumeIdentifier(volOptions, req)
conf := cephConfigData{Monitors: volOptions.Monitors, VolumeUuid: volId.uuid}
if err = conf.writeToFile(); err != nil {
glog.Errorf("failed to write ceph config file to %s: %v", getCephConfPath(volId.uuid), err)
return nil, status.Error(codes.Internal, err.Error())
}
// Create a volume in case the user didn't provide one // Create a volume in case the user didn't provide one
if volOptions.ProvisionVolume { if volOptions.ProvisionVolume {
@ -87,7 +93,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
return nil, status.Error(codes.InvalidArgument, err.Error()) return nil, status.Error(codes.InvalidArgument, err.Error())
} }
if err = storeCephAdminCredentials(cr); err != nil { if err = storeCephAdminCredentials(volId.uuid, cr); err != nil {
glog.Errorf("failed to store admin credentials for '%s': %v", cr.id, err) glog.Errorf("failed to store admin credentials for '%s': %v", cr.id, err)
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
@ -164,16 +170,16 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
if ent.VolOptions.ProvisionVolume { if ent.VolOptions.ProvisionVolume {
// The user is no longer needed // The user is no longer needed
if err := deleteCephUser(volUuid); err != nil { if err := deleteCephUser(cr, volUuid); err != nil {
glog.Warningf("failed to delete ceph user '%s': %v", cr.id, err) glog.Warningf("failed to delete ceph user '%s': %v", cr.id, err)
} }
userId := getCephUserName(volUuid) userId := getCephUserName(volUuid)
os.Remove(getCephKeyringPath(userId)) os.Remove(getCephKeyringPath(volUuid, userId))
os.Remove(getCephSecretPath(userId)) os.Remove(getCephSecretPath(volUuid, userId))
} else { } else {
os.Remove(getCephKeyringPath(cr.id)) os.Remove(getCephKeyringPath(volUuid, cr.id))
os.Remove(getCephSecretPath(cr.id)) os.Remove(getCephSecretPath(volUuid, cr.id))
} }
if err := volCache.erase(volUuid); err != nil { if err := volCache.erase(volUuid); err != nil {