From ff483d683aa8203edbe0cbf47993972e4938a483 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 4 Mar 2013 20:42:39 -0500 Subject: Put options in a list. Update nova.notifications configuration options to be in a list, like pretty much everywhere else. For some reason when I saw this it buged me so ... I changed it. Change-Id: I551aba4eaceed2d1a8925e9ab621a030af83eeca --- nova/notifications.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'nova') diff --git a/nova/notifications.py b/nova/notifications.py index 08d7fce69..bed06acf6 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -33,27 +33,25 @@ from nova import utils LOG = log.getLogger(__name__) -notify_state_opt = cfg.StrOpt('notify_on_state_change', default=None, - help='If set, send compute.instance.update notifications on instance ' - 'state changes. Valid values are None for no notifications, ' - '"vm_state" for notifications on VM state changes, or ' - '"vm_and_task_state" for notifications on VM and task state ' - 'changes.') - -notify_any_opt = cfg.BoolOpt('notify_on_any_change', default=False, - help='If set, send compute.instance.update notifications on instance ' - 'state changes. Valid values are False for no notifications, ' - 'True for notifications on any instance changes.') - -notify_api_faults = cfg.BoolOpt('notify_api_faults', default=False, - help='If set, send api.fault notifications on caught exceptions ' - 'in the API service.') +notify_opts = [ + cfg.StrOpt('notify_on_state_change', default=None, + help='If set, send compute.instance.update notifications on instance ' + 'state changes. Valid values are None for no notifications, ' + '"vm_state" for notifications on VM state changes, or ' + '"vm_and_task_state" for notifications on VM and task state ' + 'changes.'), + cfg.BoolOpt('notify_on_any_change', default=False, + help='If set, send compute.instance.update notifications on instance ' + 'state changes. Valid values are False for no notifications, ' + 'True for notifications on any instance changes.'), + cfg.BoolOpt('notify_api_faults', default=False, + help='If set, send api.fault notifications on caught exceptions ' + 'in the API service.'), +] CONF = cfg.CONF -CONF.register_opt(notify_state_opt) -CONF.register_opt(notify_any_opt) -CONF.register_opt(notify_api_faults) +CONF.register_opts(notify_opts) def send_api_fault(url, status, exception): -- cgit