From: Eric Harney <eharney@redhat.com>
Date: Thu, 10 Oct 2013 19:01:25 +0000 (-0400)
Subject: Remove option count from sample configuration
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=50d0d65169ea3d700bea0ab8e670737b6f005c75;p=openstack-build%2Fcinder-build.git

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 af0cf84ae..124578d38 100644
--- 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 eef2ab0c9..73f0dcb08 100644
--- 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('#')