Remove default_schedule_zone.

We don't use this config options.

Change-Id: I94a7940dc74341580ab954ffcda1f91fb5433e3f

diff --git a/cinder/flags.py b/cinder/flags.py
index 4340c26bfb459440f1d7b88dc760f7cd7d35991a..d0056364ce9565663b4dd69286b345abd21dd993 100644 (file)
--- a/cinder/flags.py
+++ b/cinder/flags.py
@@ -210,9 +210,6 @@ global_opts = [
     cfg.IntOpt('service_down_time',
                default=60,
                help='maximum time since last check-in for up service'),
-    cfg.StrOpt('default_schedule_zone',
-               default=None,
-               help='availability zone to use when user doesn\'t specify one'),
     cfg.StrOpt('volume_api_class',
                 default='cinder.volume.api.API',
                 help='The full class name of the volume API class to use'),

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 89c70fbdaabc3f81a1bb93a03d13ae1f1d628725..49ec258b3a43677c6f0ec3eb197aac0c8f01a801 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -168,9 +168,6 @@
 # service_down_time=60
 #### (IntOpt) maximum time since last check-in for up service
 
-# default_schedule_zone=<None>
-#### (StrOpt) availability zone to use when user doesn't specify one
-
 # volume_api_class=cinder.volume.api.API
 #### (StrOpt) The full class name of the volume API class to use
 
@@ -497,4 +494,4 @@
 #### (IntOpt) maximum number of volume gigabytes to allow per host
 
 
-# Total option count: 132
+# Total option count: 131