diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-08 17:20:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-08 17:20:36 +0000 |
| commit | fcc0e08132651c228fbd175b23b05cdaf8a802c2 (patch) | |
| tree | bd2053d962c1411c3e2b922eadbe6635cb7cb103 | |
| parent | bfec5fd629541fe2cb76eba563b6afedf963ace6 (diff) | |
| parent | 8737919f3d63766c62046c0631664d6f2034bdad (diff) | |
| download | oslo-config-fcc0e08132651c228fbd175b23b05cdaf8a802c2.tar.gz | |
Merge "generator: Handle 'cfg.Opt'-type options"
| -rw-r--r-- | oslo_config/generator.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/oslo_config/generator.py b/oslo_config/generator.py index 8e8dcfe..6f8b56f 100644 --- a/oslo_config/generator.py +++ b/oslo_config/generator.py @@ -107,15 +107,12 @@ def _format_defaults(opt): default_str = str(opt.sample_default) elif opt.default is None: default_str = '<None>' - elif (isinstance(opt, (cfg.StrOpt, cfg.IPOpt, - cfg.HostnameOpt, cfg.HostAddressOpt, - cfg.URIOpt))): - default_str = opt.default + elif isinstance(opt, (cfg.StrOpt, cfg.IntOpt, cfg.FloatOpt, cfg.IPOpt, + cfg.PortOpt, cfg.HostnameOpt, cfg.HostAddressOpt, + cfg.URIOpt, cfg.Opt)): + default_str = str(opt.default) elif isinstance(opt, cfg.BoolOpt): default_str = str(opt.default).lower() - elif isinstance(opt, (cfg.IntOpt, cfg.FloatOpt, - cfg.PortOpt)): - default_str = str(opt.default) elif isinstance(opt, (cfg.ListOpt, cfg._ConfigFileOpt, cfg._ConfigDirOpt)): default_str = ','.join(str(d) for d in opt.default) |