Remove option count from sample configuration

This doesn't serve much purpose, and makes it much harder than it
should be to merge multiple patches that change the sample config.

Change-Id: I44895bfbf4a7c9af30040f84b17a97f8e2f4e5b6

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index af0cf84ae63db551466225291fae010cf1c7dd3e..124578d38bc39b27d5ac982abcf27fbfd060bc79 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1774,4 +1774,3 @@
 #volume_dd_blocksize=1M
 
 
-# Total option count: 382

diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py
index eef2ab0c94aac5f48b4623c3201a4173623d748c..73f0dcb08e0690bfbeb7e35fa988d106fd947843 100644 (file)
--- a/tools/conf/extract_opts.py
+++ b/tools/conf/extract_opts.py
@@ -39,7 +39,6 @@ FLOATOPT = "FloatOpt"
 LISTOPT = "ListOpt"
 MULTISTROPT = "MultiStrOpt"
 
-OPTION_COUNT = 0
 OPTION_REGEX = re.compile(r"(%s)" % "|".join([STROPT, BOOLOPT, INTOPT,
                                               FLOATOPT, LISTOPT,
                                               MULTISTROPT]))
@@ -72,7 +71,6 @@ def main(srcfiles):
         mods.sort()
         for mod_str in mods:
             _print_module(mod_str)
-    print("# Total option count: %d" % OPTION_COUNT)
 
 
 def _print_module(mod_str):
@@ -99,8 +97,6 @@ def _list_opts(obj, name):
             opts.extend(attr_obj)
     if not opts:
         return
-    global OPTION_COUNT
-    OPTION_COUNT += len(opts)
     print('#')
     print('# Options defined in %s' % name)
     print('#')