rbd: fix mapOptions passing with rbd-nbd mounter

This was a regression introduced by: #2556 Fixes: #2610 Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
ceph · Nov 14, 2021 · 6a158ba · 6a158ba
1 parent 830ded5
commit 6a158ba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
@@ -226,14 +226,14 @@ func populateRbdVol(
 		}
 	}
 	if krbdSupported {
-		rv.MapOptions = req.GetVolumeContext()["mapOptions"]
-		rv.UnmapOptions = req.GetVolumeContext()["unmapOptions"]
 		rv.Mounter = req.GetVolumeContext()["mounter"]
 	} else {
 		// fallback to rbd-nbd,
 		// ignore the mapOptions and unmapOptions as they are meant for krbd use.
 		rv.Mounter = rbdNbdMounter
 	}
+	rv.MapOptions = req.GetVolumeContext()["mapOptions"]
+	rv.UnmapOptions = req.GetVolumeContext()["unmapOptions"]
 
 	rv.VolID = volID