diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 14:48:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 14:48:09 +0000 |
| commit | 365c9f0e169ff6f44cee07b6cdc271780a4bc3c4 (patch) | |
| tree | ef4ed39fae025e31f4cd15556d617dbf64c6d7eb /nova/utils.py | |
| parent | 235239c97bc3bd948f1e4a50b69986e741c53e19 (diff) | |
| parent | f005a70a6f3cdee0aa0fea9c64e0c5b8bd597ba9 (diff) | |
| download | nova-365c9f0e169ff6f44cee07b6cdc271780a4bc3c4.tar.gz nova-365c9f0e169ff6f44cee07b6cdc271780a4bc3c4.tar.xz nova-365c9f0e169ff6f44cee07b6cdc271780a4bc3c4.zip | |
Merge "Move monkey patch config opts into nova.utils"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py index fcdc65243..2491c5fcb 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -53,9 +53,20 @@ from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils - +monkey_patch_opts = [ + cfg.BoolOpt('monkey_patch', + default=False, + help='Whether to log monkey patching'), + cfg.ListOpt('monkey_patch_modules', + default=[ + 'nova.api.ec2.cloud:nova.notifier.api.notify_decorator', + 'nova.compute.api:nova.notifier.api.notify_decorator' + ], + help='List of modules/decorators to monkey patch'), +] LOG = logging.getLogger(__name__) CONF = cfg.CONF +CONF.register_opts(monkey_patch_opts) CONF.register_opt( cfg.BoolOpt('disable_process_locking', default=False, help='Whether to disable inter-process locks')) @@ -63,7 +74,6 @@ CONF.import_opt('glance_host', 'nova.config') CONF.import_opt('glance_port', 'nova.config') CONF.import_opt('glance_protocol', 'nova.config') CONF.import_opt('instance_usage_audit_period', 'nova.config') -CONF.import_opt('monkey_patch', 'nova.config') CONF.import_opt('rootwrap_config', 'nova.config') CONF.import_opt('service_down_time', 'nova.config') |