Remove unused config options

The following options are not used.

o fake_tests=true
  This configuration was removed in the following commit.

    commit 6ae520677da80103bae79e3db3569360df1220cd
    Author: Monty Taylor <mordred@inaugust.com>
    Date:   Fri May 24 01:36:21 2013 +0200

        Replace custom skip_ methods.

o backlog=4096
  This configuration was added in the following commit.

    commit 24d961023f2a32ca3454991a7891199d2da796dc
    Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
    Date:   Sat Jan 12 16:16:19 2013 -0500

        Support for SSL in wsgi.Server

  But there is no evidence that was used.

o bindir=$pybasedir/bin
  This configuration was added in the following commit.

    commit c53d8e343e50d4cf7ea9a6a81258848c2d893bfb
    Author: Jenkins <jenkins@review.openstack.org>
    Date:   Thu May 3 10:48:26 2012 -0700

        Initial fork out of Nova.

  But there is no evidence that was used.

o root_helper=sudo
  This configuration was removed in the following commit.

    commit 5bce6ad46f57d22fcb22ba9e194fbd1e2d53f55d
    Author: John Griffith <john.griffith@solidfire.com>
    Date:   Tue Jun 4 17:07:03 2013 -0600

        Use common.processutils.execute

o nexenta_mount_options=<None>
  This configuration was added in the following commit.

    commit 96677735f6d8f1f5b6380127956921f719aab799
    Author: Mikhail Khodos <hodosmb@gmail.com>
    Date:   Wed Aug 14 11:18:12 2013 -0700

        Adds Nexenta NFS driver

  But there is no evidence that was used.

o nexenta_used_ratio=0.95
  This configuration was added in the following commit.

    commit 96677735f6d8f1f5b6380127956921f719aab799
    Author: Mikhail Khodos <hodosmb@gmail.com>
    Date:   Wed Aug 14 11:18:12 2013 -0700

        Adds Nexenta NFS driver

  But there is no evidence that was used.

o nexenta_oversub_ratio=1.0
  This configuration was added in the following commit.

    commit 96677735f6d8f1f5b6380127956921f719aab799
    Author: Mikhail Khodos <hodosmb@gmail.com>
    Date:   Wed Aug 14 11:18:12 2013 -0700

        Adds Nexenta NFS driver

  But there is no evidence that was used.

o zadara_default_striping_mode=simple
  This configuration was removed in the following commit.

    commit 2f907133aeaee09f58be30e75089c23b13573500
    Author: Vladimir Popovski <vladimir@zadarastorage.com>
    Date:   Fri Aug 16 04:34:54 2013 +0000

        Add features to Zadara Storage Cinder driver

o zadara_default_stripesize=64
  This configuration was removed in the following commit.

    commit 2f907133aeaee09f58be30e75089c23b13573500
    Author: Vladimir Popovski <vladimir@zadarastorage.com>
    Date:   Fri Aug 16 04:34:54 2013 +0000

        Add features to Zadara Storage Cinder driver

Change-Id: Ie78b8c7fc081899b8053060150e81e1a6c5d4958

diff --git a/cinder/common/config.py b/cinder/common/config.py
index b12447b7f18f953fc1e581981a47d91717321fa5..4b4703673f36068677e2607e97171f080349bec9 100644 (file)
--- 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 fb8ee2b964bbe5eca03f55469115c0cbad6195ff..da3b8a12e83dc792867bcdde40997593fb53f360 100644 (file)
--- 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 516349f4b712188eaeaa1ecdfcacf39775089420..ee872a2e37b525381974a560af1954669a9221ab 100644 (file)
--- 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 c65d366a294b0c979bcacefdc8a256888234442b..01063caaf958f1a9782e96d4fd711dbed2963ede 100644 (file)
--- 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 bc41b61acd84ad073a5c1efb8c28674cbd1fa63a..a93d73d83c6913ea30e5a700da09115764054163 100644 (file)
--- 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 ea38194f9bec1d6f66cfe7678ec0bbc89fde8021..3e3b8e4074f2e11491a39420fe69972ad73085f0 100644 (file)
--- 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=<None>
-
-# 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