diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-05 17:56:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-05 17:56:00 +0000 |
| commit | b75efede1a0e1ed052f1f89f25bbb07be18da556 (patch) | |
| tree | 25fb1da06d94834da1e9efeea72331affd8ec5e2 | |
| parent | 2ec3e232dc1e112886ceff350aa85e86a298b28e (diff) | |
| parent | 65ec6529d440ea3a289fee9ce0929991d26d273b (diff) | |
Merge "Use cfg's new group autocreation feature"
| -rw-r--r-- | keystone/config.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/keystone/config.py b/keystone/config.py index 5c3dff28..3a22fbdf 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -94,45 +94,38 @@ def setup_logging(conf): def register_str(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) + group = kw.pop('group', None) return conf.register_opt(cfg.StrOpt(*args, **kw), group=group) def register_cli_str(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) + group = kw.pop('group', None) return conf.register_cli_opt(cfg.StrOpt(*args, **kw), group=group) def register_bool(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) + group = kw.pop('group', None) return conf.register_opt(cfg.BoolOpt(*args, **kw), group=group) def register_cli_bool(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) + group = kw.pop('group', None) return conf.register_cli_opt(cfg.BoolOpt(*args, **kw), group=group) def register_int(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) + group = kw.pop('group', None) return conf.register_opt(cfg.IntOpt(*args, **kw), group=group) def register_cli_int(*args, **kw): conf = kw.pop('conf', CONF) - group = _ensure_group(kw, conf) - return conf.register_cli_opt(cfg.IntOpt(*args, **kw), group=group) - - -def _ensure_group(kw, conf): group = kw.pop('group', None) - if group: - conf.register_group(cfg.OptGroup(name=group)) - return group + return conf.register_cli_opt(cfg.IntOpt(*args, **kw), group=group) CONF = CommonConfig(project='keystone') |