From 61aae0ffacc346aba42f11c5a1c890bfa79c261f Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Tue, 28 Jun 2016 15:47:39 +0800 Subject: [PATCH] Config: no need to set default=None By default oslo.cfg sets the default value as None. There is no need to explicitly do this. TrivialFix Change-Id: I57fa9651ea56a180a910d6cbf7b7f385da8af239 --- oslo_messaging/_drivers/amqp1_driver/opts.py | 2 -- .../_drivers/pika_driver/pika_connection_factory.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/oslo_messaging/_drivers/amqp1_driver/opts.py b/oslo_messaging/_drivers/amqp1_driver/opts.py index 5c69c966c..ca12be470 100644 --- a/oslo_messaging/_drivers/amqp1_driver/opts.py +++ b/oslo_messaging/_drivers/amqp1_driver/opts.py @@ -32,7 +32,6 @@ amqp1_opts = [ help="address prefix when sending to any server in group"), cfg.StrOpt('container_name', - default=None, deprecated_group='amqp1', help='Name for the AMQP container'), @@ -62,7 +61,6 @@ amqp1_opts = [ help='Private key PEM file used to sign cert_file certificate'), cfg.StrOpt('ssl_key_password', - default=None, deprecated_group='amqp1', secret=True, help='Password for decrypting ssl_key_file (if encrypted)'), diff --git a/oslo_messaging/_drivers/pika_driver/pika_connection_factory.py b/oslo_messaging/_drivers/pika_driver/pika_connection_factory.py index 3df08060a..a78c55edb 100644 --- a/oslo_messaging/_drivers/pika_driver/pika_connection_factory.py +++ b/oslo_messaging/_drivers/pika_driver/pika_connection_factory.py @@ -36,15 +36,15 @@ HOST_CONNECTION_LAST_TRY_TIME = "last_try_time" HOST_CONNECTION_LAST_SUCCESS_TRY_TIME = "last_success_try_time" pika_opts = [ - cfg.IntOpt('channel_max', default=None, + cfg.IntOpt('channel_max', help='Maximum number of channels to allow'), - cfg.IntOpt('frame_max', default=None, + cfg.IntOpt('frame_max', help='The maximum byte size for an AMQP frame'), cfg.IntOpt('heartbeat_interval', default=3, help="How often to send heartbeats for consumer's connections"), - cfg.BoolOpt('ssl', default=None, + cfg.BoolOpt('ssl', help='Enable SSL'), - cfg.DictOpt('ssl_options', default=None, + cfg.DictOpt('ssl_options', help='Arguments passed to ssl.wrap_socket'), cfg.FloatOpt('socket_timeout', default=0.25, help="Set socket timeout in seconds for connection's socket"),