Remove memcached_servers config option.

We don't use this in Cinder.

Change-Id: Id8503ff373622a2667fe0575f79e089056677019

diff --git a/cinder/flags.py b/cinder/flags.py
index ef2e2ae0a83ad317b84d0862007d2f3182930f33..4340c26bfb459440f1d7b88dc760f7cd7d35991a 100644 (file)
--- a/cinder/flags.py
+++ b/cinder/flags.py
@@ -187,9 +187,6 @@ global_opts = [
     cfg.StrOpt('notification_driver',
                default='cinder.openstack.common.notifier.no_op_notifier',
                help='Default driver for sending notifications'),
-    cfg.ListOpt('memcached_servers',
-                default=None,
-                help='Memcached servers or None for in process cache.'),
     cfg.StrOpt('instance_usage_audit_period',
                default='month',
                help='time period to generate instance usages for.  '

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 891064eef1e081f3c0bd861c1b95298fd099dd2d..89c70fbdaabc3f81a1bb93a03d13ae1f1d628725 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -145,9 +145,6 @@
 # notification_driver=cinder.openstack.common.notifier.no_op_notifier
 #### (StrOpt) Default driver for sending notifications
 
-# memcached_servers=<None>
-#### (ListOpt) Memcached servers or None for in process cache.
-
 # instance_usage_audit_period=month
 #### (StrOpt) time period to generate instance usages for.  Time period
 ####          must be hour, day, month or year
@@ -500,4 +497,4 @@
 #### (IntOpt) maximum number of volume gigabytes to allow per host
 
 
-# Total option count: 133
+# Total option count: 132