Correctly set up deprecation warning

In the current state, no warning was output in the logs.
With this fix, a warning is output in the logs and the value from
[DEFAULT] is used correctly.

Change-Id: I6a7f856e583aed31a3316c0b174a5559cd09e34b
Closes-Bug: #1671847
(cherry picked from commit abd18a12e3e6b571d35499857a005a7bfd7237a4)

diff --git a/nova/conf/console.py b/nova/conf/console.py
index a6d324112b9e8ebfc05d07ad5115f9e012e2217d..6d592d6c40d6267cd58459a3cc1bcc725b30d1f3 100644 (file)
--- a/nova/conf/console.py
+++ b/nova/conf/console.py
@@ -69,7 +69,7 @@ Possible values:
 console_opts = [
     cfg.ListOpt('allowed_origins',
         default=[],
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         deprecated_name='console_allowed_origins',
         help="""
 Adds list of allowed origins to the console websocket proxy to allow

diff --git a/nova/conf/notifications.py b/nova/conf/notifications.py
index f2025efc22de0f1ef88f63af4de94d38a396c05b..fb7ee88abf65531e4cac7d132e01a6d95e8e0a94 100644 (file)
--- a/nova/conf/notifications.py
+++ b/nova/conf/notifications.py
@@ -30,7 +30,7 @@ ALL_OPTS = [
     cfg.StrOpt(
         'notify_on_state_change',
         choices=(None, 'vm_state', 'vm_and_task_state'),
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         help="""
 If set, send compute.instance.update notifications on instance state
 changes.
@@ -48,7 +48,7 @@ Possible values:
     cfg.BoolOpt(
         'notify_on_api_faults',
         default=False,
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         deprecated_name='notify_api_faults',
         help="""
 If enabled, send api.fault notifications on caught exceptions in the
@@ -59,14 +59,14 @@ API service.
         'default_level',
         default='INFO',
         choices=('DEBUG', 'INFO', 'WARN', 'ERROR', 'CRITICAL'),
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         deprecated_name='default_notification_level',
         help="Default notification level for outgoing notifications."),
 
     cfg.StrOpt(
         'default_publisher_id',
         default='$my_ip',
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         help="""
 Default publisher_id for outgoing notifications. If you consider routing
 notifications using different publisher, change this value accordingly.
@@ -84,7 +84,7 @@ Related options:
         'notification_format',
         choices=['unversioned', 'versioned', 'both'],
         default='both',
-        deprecated_group='default',
+        deprecated_group='DEFAULT',
         help="""
 Specifies which notification format shall be used by nova.