diff --git a/barbican/crypto/dogtag_crypto.py b/barbican/crypto/dogtag_crypto.py index 651a51de3..e28ae8e39 100644 --- a/barbican/crypto/dogtag_crypto.py +++ b/barbican/crypto/dogtag_crypto.py @@ -34,10 +34,8 @@ dogtag_crypto_plugin_group = cfg.OptGroup(name='dogtag_crypto_plugin', title="Dogtag Crypto Plugin Options") dogtag_crypto_plugin_opts = [ cfg.StrOpt('pem_path', - default=None, help=u._('Path to PEM file for authentication')), cfg.StrOpt('pem_password', - default=None, help=u._('Password to unlock PEM file')), cfg.StrOpt('drm_host', default="localhost", @@ -46,10 +44,8 @@ dogtag_crypto_plugin_opts = [ default="8443", help=u._('Port for the DRM')), cfg.StrOpt('nss_db_path', - default=None, help=u._('Path to the NSS certificate database')), cfg.StrOpt('nss_password', - default=None, help=u._('Password for NSS certificate database')) ] diff --git a/barbican/crypto/p11_crypto.py b/barbican/crypto/p11_crypto.py index 121983d32..035f19075 100644 --- a/barbican/crypto/p11_crypto.py +++ b/barbican/crypto/p11_crypto.py @@ -33,10 +33,8 @@ p11_crypto_plugin_group = cfg.OptGroup(name='p11_crypto_plugin', title="PKCS11 Crypto Plugin Options") p11_crypto_plugin_opts = [ cfg.StrOpt('library_path', - default=None, help=u._('Path to vendor PKCS11 library')), cfg.StrOpt('login', - default=None, help=u._('Password to login to PKCS11 session')) ] CONF.register_group(p11_crypto_plugin_group) diff --git a/barbican/model/migration/commands.py b/barbican/model/migration/commands.py index e4911fe77..9ff277d6d 100644 --- a/barbican/model/migration/commands.py +++ b/barbican/model/migration/commands.py @@ -33,7 +33,7 @@ LOG = utils.getLogger(__name__) db_opts = [ - cfg.StrOpt('sql_connection', default=None), + cfg.StrOpt('sql_connection'), ] CONF = cfg.CONF diff --git a/barbican/model/repositories.py b/barbican/model/repositories.py index fac32c064..056a13e58 100644 --- a/barbican/model/repositories.py +++ b/barbican/model/repositories.py @@ -54,7 +54,7 @@ db_opts = [ cfg.IntOpt('sql_max_retries', default=60), cfg.IntOpt('sql_retry_interval', default=1), cfg.BoolOpt('db_auto_create', default=True), - cfg.StrOpt('sql_connection', default=None), + cfg.StrOpt('sql_connection'), cfg.IntOpt('max_limit_paging', default=100), cfg.IntOpt('default_limit_paging', default=10), ]