diff --git a/barbican/common/config.py b/barbican/common/config.py index 3295d9fd1..7eda543bd 100644 --- a/barbican/common/config.py +++ b/barbican/common/config.py @@ -60,10 +60,10 @@ db_opts = [ cfg.BoolOpt('db_auto_create', default=True), cfg.IntOpt('max_limit_paging', default=100), cfg.IntOpt('default_limit_paging', default=10), - cfg.StrOpt('sql_pool_class', default=None), + cfg.StrOpt('sql_pool_class'), cfg.BoolOpt('sql_pool_logging', default=False), - cfg.IntOpt('sql_pool_size', default=None), - cfg.IntOpt('sql_pool_max_overflow', default=None), + cfg.IntOpt('sql_pool_size'), + cfg.IntOpt('sql_pool_max_overflow'), ] retry_opt_group = cfg.OptGroup(name='retry_scheduler', diff --git a/barbican/plugin/kmip_secret_store.py b/barbican/plugin/kmip_secret_store.py index 1f589f0ad..87fb7d150 100644 --- a/barbican/plugin/kmip_secret_store.py +++ b/barbican/plugin/kmip_secret_store.py @@ -44,11 +44,9 @@ CONF = config.new_config() kmip_opt_group = cfg.OptGroup(name='kmip_plugin', title='KMIP Plugin') kmip_opts = [ cfg.StrOpt('username', - default=None, help=u._('Username for authenticating with KMIP server') ), cfg.StrOpt('password', - default=None, help=u._('Password for authenticating with KMIP server'), secret=True, ), @@ -65,16 +63,13 @@ kmip_opts = [ help=u._('SSL version, maps to the module ssl\'s constants'), ), cfg.StrOpt('ca_certs', - default=None, help=u._('File path to concatenated "certification authority" ' 'certificates'), ), cfg.StrOpt('certfile', - default=None, help=u._('File path to local client certificate'), ), cfg.StrOpt('keyfile', - default=None, help=u._('File path to local client certificate keyfile'), ), cfg.BoolOpt('pkcs1_only',