Merge "Stop describing defaults explicitly"

magnum/conf/api.py

@@ -32,11 +32,11 @@ api_service_opts = [
                ),
     cfg.StrOpt('ssl_cert_file',
                help="This option allows setting path to the SSL certificate "
-                    "of API server. "),
+                    "of API server."),
     cfg.StrOpt('ssl_key_file',
                help="This option specifies the path to the file where SSL "
                     "private key of API server is stored when SSL is in "
-                    "effect. "),
+                    "effect."),
     cfg.BoolOpt('enabled_ssl',
                 default=False,
                 help='Enable SSL Magnum API service'),

magnum/conf/certificates.py

@@ -23,15 +23,13 @@ certificates_group = cfg.OptGroup(name='certificates',
 cert_manager_opts = [
     cfg.StrOpt('cert_manager_type',
                default=DEFAULT_CERT_MANAGER,
-               help='Certificate Manager plugin. '
-                    'Defaults to {0}.'.format(DEFAULT_CERT_MANAGER))
+               help='Certificate Manager plugin.')
 ]
 
 local_cert_manager_opts = [
     cfg.StrOpt('storage_path',
                default=TLS_STORAGE_DEFAULT,
-               help='Absolute path of the certificate storage directory. '
-                    'Defaults to /var/lib/magnum/certificates/.')
+               help='Absolute path of the certificate storage directory.')
 ]
 
 ALL_OPTS = list(itertools.chain(

magnum/conf/drivers.py

@@ -32,14 +32,13 @@ drivers_opts = [
                     'install in all cluster nodes.'),
     cfg.ListOpt('disabled_drivers',
                 default=[],
-                help='Disabled driver entry points. The default value is []. '
-                     ' Means if not specified, then all available drivers '
-                     'are enabled.'
+                help='Disabled driver entry points. If empty, then all '
+                     'available drivers are enabled.'
                 ),
     cfg.ListOpt('enabled_beta_drivers',
                 default=[],
                 help='List of beta drivers to enable. Beta drivers are not '
-                     ' intended for production. Defaults to []. '
+                     'intended for production.'
                 ),
 ]
 

magnum/conf/x509.py

@@ -48,7 +48,7 @@ x509_opts = [
                default=365 * 5,
                help=_('Number of days for which a certificate is valid.')),
     cfg.IntOpt('rsa_key_size',
-               default=2048, help=_('Size of generated private key. '))]
+               default=2048, help=_('Size of generated private key.'))]
 
 
 def register_opts(conf):