ceph csi: tweak options handling around enabling csi
Simplify one function and improve option wording. Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
1 parent
37c7aa35d3
commit
7ee207b0fb
2 files changed
+3
-6
No files matched your search
@@ -43,8 +43,8 @@ func init() {
|
||||
operatorCmd.Flags().DurationVar(&mon.HealthCheckInterval, "mon-healthcheck-interval", mon.HealthCheckInterval, "mon health check interval (duration)")
|
||||
operatorCmd.Flags().DurationVar(&mon.MonOutTimeout, "mon-out-timeout", mon.MonOutTimeout, "mon out timeout (duration)")
|
||||
|
||||
operatorCmd.Flags().BoolVar(&csi.EnableRBD, "csi-enable-rbd", false, "whether enable ceph-csi rbd driver")
|
||||
operatorCmd.Flags().BoolVar(&csi.EnableCephFS, "csi-enable-cephfs", false, "whether enable ceph-csi cephfs driver")
|
||||
operatorCmd.Flags().BoolVar(&csi.EnableRBD, "csi-enable-rbd", false, "enable ceph-csi rbd support")
|
||||
operatorCmd.Flags().BoolVar(&csi.EnableCephFS, "csi-enable-cephfs", false, "enable ceph-csi cephfs support")
|
||||
// csi images
|
||||
operatorCmd.Flags().StringVar(&csi.CSIParam.RBDPluginImage, "csi-rbd-image", csi.DefaultRBDPluginImage, "ceph-csi rbd plugin image")
|
||||
operatorCmd.Flags().StringVar(&csi.CSIParam.CephFSPluginImage, "csi-cephfs-image", csi.DefaultCephFSPluginImage, "ceph-csi cephfs plugin image")
|
||||
|
||||
@@ -73,10 +73,7 @@ const (
|
||||
)
|
||||
|
||||
func CSIEnabled() bool {
|
||||
if EnableRBD || EnableCephFS {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
return EnableRBD || EnableCephFS
|
||||
}
|
||||
|
||||
func SetCSINamespace(namespace string) {
|
||||
|
||||
Reference in new issue
Block a user