Set default values for NFS/GlusterFS share_config files

By default, set:
 nfs_shares_config = /etc/cinder/nfs_shares
 glusterfs_shares_config = /etc/cinder/glusterfs_shares

This makes use of these drivers require one less manual
configuration step.

Also fix wording of help for glusterfs/nfs_mount_point_base
options.

Change-Id: I93bd3a8f08d4d5307f78e983d1080afae663dfe4

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 3e287411f0e21439f5b2827afca3784ad2f33b00..21f3c30c9013adbf130a835cd2af65442b4d3554 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -29,11 +29,11 @@ LOG = logging.getLogger(__name__)
 
 volume_opts = [
     cfg.StrOpt('glusterfs_shares_config',
-               default=None,
+               default='/etc/cinder/glusterfs_shares',
                help='File with the list of available gluster shares'),
     cfg.StrOpt('glusterfs_mount_point_base',
                default='$state_path/mnt',
-               help='Base dir where gluster expected to be mounted'),
+               help='Base dir containing mount points for gluster shares'),
     cfg.StrOpt('glusterfs_disk_util',
                default='df',
                help='Use du or df for free space calculation'),

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 4638e1268054dd58840ec67ddf9685cc105e3313..c8def7495916d31c718ccfdc6cba443ad6394461 100755 (executable)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -29,11 +29,11 @@ LOG = logging.getLogger(__name__)
 
 volume_opts = [
     cfg.StrOpt('nfs_shares_config',
-               default=None,
+               default='/etc/cinder/nfs_shares',
                help='File with the list of available nfs shares'),
     cfg.StrOpt('nfs_mount_point_base',
                default='$state_path/mnt',
-               help='Base dir where nfs expected to be mounted'),
+               help='Base dir containing mount points for nfs shares'),
     cfg.StrOpt('nfs_disk_util',
                default='df',
                help='Use du or df for free space calculation'),

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 36b8e10d4fc3e6f9e29268ee8162c1bc30d96e7a..b3a8afc94a02ea88276383aab1f0514b9b551a89 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -837,7 +837,7 @@
 
 # File with the list of available gluster shares (string
 # value)
-#glusterfs_shares_config=<None>
+#glusterfs_shares_config=/etc/cinder/glusterfs_shares
 
 # Base dir where gluster expected to be mounted (string value)
 #glusterfs_mount_point_base=$state_path/mnt
@@ -1030,7 +1030,7 @@
 #
 
 # File with the list of available nfs shares (string value)
-#nfs_shares_config=<None>
+#nfs_shares_config=/etc/cinder/nfs_shares
 
 # Base dir where nfs expected to be mounted (string value)
 #nfs_mount_point_base=$state_path/mnt