diff --git a/contrib/rackspace/rackspace/clients.py b/contrib/rackspace/rackspace/clients.py index 28c693e06a..e4362cc542 100644 --- a/contrib/rackspace/rackspace/clients.py +++ b/contrib/rackspace/rackspace/clients.py @@ -40,7 +40,6 @@ except ImportError: cloud_opts = [ cfg.StrOpt('region_name', - default=None, help=_('Region for connecting to services.')) ] cfg.CONF.register_opts(cloud_opts) diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py index 030f4c131f..e85d4ca2e1 100644 --- a/heat/api/aws/ec2token.py +++ b/heat/api/aws/ec2token.py @@ -33,7 +33,6 @@ logger = logging.getLogger(__name__) opts = [ cfg.StrOpt('auth_uri', - default=None, help=_("Authentication Endpoint URI.")), cfg.BoolOpt('multi_cloud', default=False, diff --git a/heat/common/config.py b/heat/common/config.py index 3ef5a4e437..617864452a 100644 --- a/heat/common/config.py +++ b/heat/common/config.py @@ -56,7 +56,6 @@ service_opts = [ help='Instance connection to CFN/CW API validate certs if SSL ' 'is used.'), cfg.StrOpt('region_name_for_services', - default=None, help='Default region name used to get services endpoints.'), cfg.StrOpt('heat_stack_user_role', default="heat_stack_user", diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py index a29784ea45..6f1cbe5eb7 100644 --- a/heat/common/wsgi.py +++ b/heat/common/wsgi.py @@ -62,11 +62,11 @@ api_opts = [ help=_("Number of backlog requests " "to configure the socket with."), deprecated_group='DEFAULT'), - cfg.StrOpt('cert_file', default=None, + cfg.StrOpt('cert_file', help=_("Location of the SSL certificate file " "to use for SSL mode."), deprecated_group='DEFAULT'), - cfg.StrOpt('key_file', default=None, + cfg.StrOpt('key_file', help=_("Location of the SSL key file to use " "for enabling SSL mode."), deprecated_group='DEFAULT'), @@ -96,11 +96,11 @@ api_cfn_opts = [ help=_("Number of backlog requests " "to configure the socket with."), deprecated_group='DEFAULT'), - cfg.StrOpt('cert_file', default=None, + cfg.StrOpt('cert_file', help=_("Location of the SSL certificate file " "to use for SSL mode."), deprecated_group='DEFAULT'), - cfg.StrOpt('key_file', default=None, + cfg.StrOpt('key_file', help=_("Location of the SSL key file to use " "for enabling SSL mode."), deprecated_group='DEFAULT'), @@ -130,11 +130,11 @@ api_cw_opts = [ help=_("Number of backlog requests " "to configure the socket with."), deprecated_group='DEFAULT'), - cfg.StrOpt('cert_file', default=None, + cfg.StrOpt('cert_file', help=_("Location of the SSL certificate file " "to use for SSL mode."), deprecated_group='DEFAULT'), - cfg.StrOpt('key_file', default=None, + cfg.StrOpt('key_file', help=_("Location of the SSL key file to use " "for enabling SSL mode."), deprecated_group='DEFAULT'), diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index d102089ff6..c789149d8b 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/heat/engine/resources/loadbalancer.py @@ -197,7 +197,6 @@ lb_template_default = r''' # Allow user to provide alternative nested stack template to the above loadbalancer_opts = [ cfg.StrOpt('loadbalancer_template', - default=None, help='Custom template for the built-in ' 'loadbalancer nested stack.')] cfg.CONF.register_opts(loadbalancer_opts)