openstack/cinder
Code Issues Proposed changes

Set default values for NFS/GlusterFS share_config files

Browse Source 
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
This commit is contained in:
Eric Harney 2013-05-10 14:08:43 -04:00
parent aef83c437e
commit 6d2d88c187
3 changed files with 6 additions and 6 deletions
cinder/volume/drivers
glusterfs.pynfs.py
etc/cinder
cinder.conf.sample

4
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'),

4
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'),

4
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