diff --git a/cinder/common/config.py b/cinder/common/config.py index b12447b7f18..4b4703673f3 100644 --- a/cinder/common/config.py +++ b/cinder/common/config.py @@ -64,9 +64,6 @@ core_opts = [ '..', '..')), help='Directory where the cinder python module is installed'), - cfg.StrOpt('bindir', - default='$pybasedir/bin', - help='Directory where cinder binaries are installed'), cfg.StrOpt('state_path', default='$pybasedir', help="Top-level directory for maintaining cinder's state"), ] @@ -170,9 +167,6 @@ global_opts = [ default='month', help='time period to generate volume usages for. ' 'Time period must be hour, day, month or year'), - cfg.StrOpt('root_helper', - default='sudo', - help='Deprecated: command to use for running commands as root'), cfg.StrOpt('rootwrap_config', default='/etc/cinder/rootwrap.conf', help='Path to the rootwrap configuration file to use for ' diff --git a/cinder/test.py b/cinder/test.py index fb8ee2b964b..da3b8a12e83 100644 --- a/cinder/test.py +++ b/cinder/test.py @@ -46,10 +46,7 @@ from cinder.tests import conf_fixture test_opts = [ cfg.StrOpt('sqlite_clean_db', default='clean.sqlite', - help='File name of clean sqlite db'), - cfg.BoolOpt('fake_tests', - default=True, - help='should we use everything for testing'), ] + help='File name of clean sqlite db'), ] CONF = cfg.CONF CONF.register_opts(test_opts) diff --git a/cinder/volume/drivers/nexenta/options.py b/cinder/volume/drivers/nexenta/options.py index 516349f4b71..ee872a2e37b 100644 --- a/cinder/volume/drivers/nexenta/options.py +++ b/cinder/volume/drivers/nexenta/options.py @@ -73,20 +73,6 @@ NEXENTA_NFS_OPTIONS = [ cfg.StrOpt('nexenta_volume_compression', default='on', help='Default compression value for new ZFS folders.'), - cfg.StrOpt('nexenta_mount_options', - default=None, - help='Mount options passed to the nfs client. See section ' - 'of the nfs man page for details'), - cfg.FloatOpt('nexenta_used_ratio', - default=0.95, - help=('Percent of ACTUAL usage of the underlying volume ' - 'before no new volumes can be allocated to the volume ' - 'destination.')), - cfg.FloatOpt('nexenta_oversub_ratio', - default=1.0, - help=('This will compare the allocated to available space on ' - 'the volume destination. If the ratio exceeds this ' - 'number, the destination will no longer be valid.')), cfg.BoolOpt('nexenta_nms_cache_volroot', default=True, help=('If set True cache NexentaStor appliance volroot option ' diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py index c65d366a294..01063caaf95 100644 --- a/cinder/volume/drivers/zadara.py +++ b/cinder/volume/drivers/zadara.py @@ -59,12 +59,6 @@ zadara_opts = [ cfg.BoolOpt('zadara_vol_encrypt', default=False, help='Default encryption policy for volumes'), - cfg.StrOpt('zadara_default_striping_mode', - default='simple', - help='Default striping mode for volumes'), - cfg.StrOpt('zadara_default_stripesize', - default='64', - help='Default stripe size for volumes'), cfg.StrOpt('zadara_vol_name_template', default='OS_%s', help='Default template for VPSA volume names'), diff --git a/cinder/wsgi.py b/cinder/wsgi.py index bc41b61acd8..a93d73d83c6 100644 --- a/cinder/wsgi.py +++ b/cinder/wsgi.py @@ -41,9 +41,6 @@ from cinder import utils socket_opts = [ - cfg.IntOpt('backlog', - default=4096, - help="Number of backlog requests to configure the socket with"), cfg.IntOpt('tcp_keepidle', default=600, help="Sets the value of TCP_KEEPIDLE in seconds for each " diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index ea38194f9be..3e3b8e4074f 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -84,18 +84,11 @@ # File name of clean sqlite db (string value) #sqlite_clean_db=clean.sqlite -# should we use everything for testing (boolean value) -#fake_tests=true - # # Options defined in cinder.wsgi # -# Number of backlog requests to configure the socket with -# (integer value) -#backlog=4096 - # Sets the value of TCP_KEEPIDLE in seconds for each server # socket. Not supported on OS X. (integer value) #tcp_keepidle=600 @@ -244,9 +237,6 @@ # (string value) #pybasedir=/usr/lib/python/site-packages -# Directory where cinder binaries are installed (string value) -#bindir=$pybasedir/bin - # Top-level directory for maintaining cinder's state (string # value) #state_path=$pybasedir @@ -345,10 +335,6 @@ # be hour, day, month or year (string value) #volume_usage_audit_period=month -# Deprecated: command to use for running commands as root -# (string value) -#root_helper=sudo - # Path to the rootwrap configuration file to use for running # commands as root (string value) #rootwrap_config=/etc/cinder/rootwrap.conf @@ -1327,20 +1313,6 @@ # value) #nexenta_volume_compression=on -# Mount options passed to the nfs client. See section of the -# nfs man page for details (string value) -#nexenta_mount_options= - -# Percent of ACTUAL usage of the underlying volume before no -# new volumes can be allocated to the volume destination. -# (floating point value) -#nexenta_used_ratio=0.95 - -# This will compare the allocated to available space on the -# volume destination. If the ratio exceeds this number, the -# destination will no longer be valid. (floating point value) -#nexenta_oversub_ratio=1.0 - # If set True cache NexentaStor appliance volroot option # value. (boolean value) #nexenta_nms_cache_volroot=true @@ -1716,12 +1688,6 @@ # Default encryption policy for volumes (boolean value) #zadara_vol_encrypt=false -# Default striping mode for volumes (string value) -#zadara_default_striping_mode=simple - -# Default stripe size for volumes (string value) -#zadara_default_stripesize=64 - # Default template for VPSA volume names (string value) #zadara_vol_name_template=OS_%s