From 65d9ae4a8ec589ab371227cfcff1d63559989077 Mon Sep 17 00:00:00 2001
From: Jiong Liu <liujiong@gohighsec.com>
Date: Tue, 27 Sep 2016 21:39:59 +0800
Subject: [PATCH] Remove default=None when set value in Config

By default oslo.cfg sets the default values as None [1], there is
no need to explicitly do this.

[1] https://github.com/openstack/oslo.config/blob/master/oslo_config/cfg.py#L829

Change-Id: I5cba77d5502077e2323f4e86e0d29364eabf9c4c
---
 aodh/cmd/alarm_conversion.py | 1 -
 aodh/event.py                | 1 -
 aodh/notifier/__init__.py    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/aodh/cmd/alarm_conversion.py b/aodh/cmd/alarm_conversion.py
index 3fe4917d..2c6bd8d3 100644
--- a/aodh/cmd/alarm_conversion.py
+++ b/aodh/cmd/alarm_conversion.py
@@ -81,7 +81,6 @@ def get_parser():
     )
     parser.add_argument(
         '--alarm-id',
-        default=None,
         type=str,
         help='Only convert the alarm specified by this option.',
     )
diff --git a/aodh/event.py b/aodh/event.py
index a64e29a8..0ad94bdb 100644
--- a/aodh/event.py
+++ b/aodh/event.py
@@ -34,7 +34,6 @@ OPTS = [
                help='Number of notification messages to wait before '
                'dispatching them.'),
     cfg.IntOpt('batch_timeout',
-               default=None,
                help='Number of seconds to wait before dispatching samples '
                'when batch_size is not reached (None means indefinitely).'),
 ]
diff --git a/aodh/notifier/__init__.py b/aodh/notifier/__init__.py
index 29afa3e5..00b58054 100644
--- a/aodh/notifier/__init__.py
+++ b/aodh/notifier/__init__.py
@@ -35,7 +35,6 @@ OPTS = [
                help='Number of notification messages to wait before '
                     'dispatching them.'),
     cfg.IntOpt('batch_timeout',
-               default=None,
                help='Number of seconds to wait before dispatching samples '
                     'when batch_size is not reached (None means indefinitely).'
                ),