Merge "Remove default=None for config options"

glance/api/versions.py

@@ -25,7 +25,7 @@ from glance import i18n
 _ = i18n._
 
 versions_opts = [
-    cfg.StrOpt('public_endpoint', default=None,
+    cfg.StrOpt('public_endpoint',
                help=_('Public url to use for versions endpoint. The default '
                       'is None, which will use the request\'s host_url '
                       'attribute to populate the URL base. If Glance is '

glance/async/flows/convert.py

@@ -31,7 +31,6 @@ LOG = logging.getLogger(__name__)
 
 convert_task_opts = [
     cfg.StrOpt('conversion_format',
-               default=None,
                choices=('qcow2', 'raw', 'vmdk'),
                help=_("The format to which images will be automatically "
                       "converted.")),

glance/common/config.py

@@ -70,7 +70,6 @@ task_opts = [
                help=_("Specifies which task executor to be used to run the "
                       "task scripts.")),
     cfg.StrOpt('work_dir',
-               default=None,
                help=_('Work dir for asynchronous task operations. '
                       'The directory set here will be used to operate over '
                       'images - normally before they are imported in the '