openstack/aodh
Code Issues Proposed changes

Sync config generator workaround from oslo

Browse Source 
The following workaround avoid error when parsing duplicated config
options during config generation, see bug 1262148 for the details.

7c18261 Temporary workaround for config generator

Change-Id: Ia21afa53c5801f59dd361946716d8a18c389ada5
This commit is contained in:
Lianhao Lu 2013-12-20 11:22:03 +08:00
parent 19e06732b7
commit ab3a6d54c8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/openstack/common/config/generator.py
View File

@ -121,7 +121,9 @@ def _import_module(mod_str):
def _is_in_group(opt, group): def _is_in_group(opt, group):
"Check if opt is in group." "Check if opt is in group."
for key, value in group._opts.items(): for key, value in group._opts.items():
if value['opt'] == opt: # NOTE(llu): Temporary workaround for bug #1262148, wait until
# newly released oslo.config support '==' operator.
if not(value['opt'] != opt):
return True return True
return False return False

2
ceilometer/openstack/common/gettextutils.py
View File

@ -19,7 +19,7 @@ gettext for openstack-common modules.
Usual usage in an openstack.common module: Usual usage in an openstack.common module:
from ceilometer.openstack.common.gettextutils import _ from ceilometer.openstack.common.gettextutils import _ # noqa
""" """
import copy import copy