Merge "Update oslo.config.generator"

openstack · Jul 25, 2013 · 6dcbc8c · 6dcbc8c
2 parents 7ae158b + 192c09c
commit 6dcbc8c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
@@ -3147,4 +3147,3 @@
 #keymap=en-us
 
 
-# Total option count: 627
diff --git a/nova/openstack/common/config/generator.py b/nova/openstack/common/config/generator.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012 SINA Corporation
@@ -16,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# @author: Zhongyue Luo, SINA Corporation.
-#
 
 """Extracts OpenStack config option info from module(s)."""
 
@@ -53,7 +50,6 @@
     MULTISTROPT: 'multi valued',
 }
 
-OPTION_COUNT = 0
 OPTION_REGEX = re.compile(r"(%s)" % "|".join([STROPT, BOOLOPT, INTOPT,
                                               FLOATOPT, LISTOPT,
                                               MULTISTROPT]))
@@ -100,8 +96,6 @@ def generate(srcfiles):
     for group, opts in opts_by_group.items():
         print_group_opts(group, opts)
 
-    print("# Total option count: %d" % OPTION_COUNT)
-
 
 def _import_module(mod_str):
     try:
@@ -166,9 +160,7 @@ def is_opt(o):
 def print_group_opts(group, opts_by_module):
     print("[%s]" % group)
     print('')
-    global OPTION_COUNT
     for mod, opts in opts_by_module:
-        OPTION_COUNT += len(opts)
         print('#')
         print('# Options defined in %s' % mod)
         print('#')