Fix missing spaces in strings
Where strings are continued across multiple lines, it's easy to miss a space. This fixes several incorrect strings, cleans up some formatting (don't line break inside a format specifier) and fixes typos. Change-Id: Id781b16cad03c32973a67c02ad22ce4459c6d126
This commit is contained in:
Zane Bitter
huangtianhua
parent
cfbc624b75
commit
5392273af8
@ -90,14 +90,14 @@ class VersionNegotiationFilter(wsgi.Middleware):
|
||||
return None
|
||||
else:
|
||||
LOG.debug("Unknown version in accept header: "
|
||||
"%(major_version)d.%(minor_version)d..."
|
||||
"%(major_version)d.%(minor_version)d... "
|
||||
"returning version choices."
|
||||
% {'major_version': major_version,
|
||||
'minor_version': minor_version})
|
||||
return self.versions_app
|
||||
else:
|
||||
if req.accept not in ('*/*', ''):
|
||||
LOG.debug("Unknown accept header: %s..."
|
||||
LOG.debug("Unknown accept header: %s... "
|
||||
"returning HTTP not found.", req.accept)
|
||||
return webob.exc.HTTPNotFound()
|
||||
return None
|
||||
|
||||
@ -248,7 +248,7 @@ def get_socket(conf, default_port):
|
||||
raise
|
||||
eventlet.sleep(0.1)
|
||||
if not sock:
|
||||
raise RuntimeError(_("Could not bind to %(bind_addr)s"
|
||||
raise RuntimeError(_("Could not bind to %(bind_addr)s "
|
||||
"after trying for 30 seconds")
|
||||
% {'bind_addr': bind_addr})
|
||||
|
||||
|
||||
@ -333,7 +333,7 @@ class AutoScalingGroup(instgrp.InstanceGroup, cooldown.CooldownMixin):
|
||||
})
|
||||
notification.send(**notif)
|
||||
except Exception:
|
||||
LOG.error(_LE("Error in performing scaling adjustment for"
|
||||
LOG.error(_LE("Error in performing scaling adjustment for "
|
||||
"group %s.") % self.name)
|
||||
raise
|
||||
finally:
|
||||
|
||||
@ -182,7 +182,7 @@ class ResourceGroup(stack_resource.StackResource):
|
||||
"the 'refs' attribute. "
|
||||
"Note this is destructive on update when specified; "
|
||||
"even if the count is not being reduced, and once "
|
||||
"a resource name is removed, it's name is never "
|
||||
"a resource name is removed, its name is never "
|
||||
"reused in subsequent updates."
|
||||
),
|
||||
default=[]
|
||||
|
||||
@ -405,10 +405,10 @@ class Instance(resource.Resource):
|
||||
|
||||
if instance.status != self.ACTIVE:
|
||||
return False
|
||||
LOG.info(_LI("Database instance %(database)s created (flavor:%("
|
||||
"flavor)s,volume:%(volume)s, datastore:%("
|
||||
"datastore_type)s, datastore_version:%("
|
||||
"datastore_version)s)"),
|
||||
LOG.info(_LI("Database instance %(database)s created "
|
||||
"(flavor:%(flavor)s, volume:%(volume)s, "
|
||||
"datastore:%(datastore_type)s, "
|
||||
"datastore_version:%(datastore_version)s)"),
|
||||
{'database': self._dbinstance_name(),
|
||||
'flavor': self.flavor,
|
||||
'volume': self.volume,
|
||||
|
||||
@ -3661,8 +3661,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
|
||||
def test_db_encrypt_decrypt_verbose_on(self):
|
||||
info_logger = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.INFO,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
ctx = utils.dummy_context()
|
||||
template = self._create_template()
|
||||
user_creds = create_user_creds(ctx)
|
||||
@ -3684,8 +3684,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
|
||||
|
||||
info_logger2 = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.INFO,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
|
||||
db_api.db_decrypt_parameters_and_properties(
|
||||
ctx, cfg.CONF.auth_encryption_key, verbose=True)
|
||||
@ -3703,8 +3703,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
|
||||
def test_db_encrypt_decrypt_verbose_off(self):
|
||||
info_logger = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.INFO,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
ctx = utils.dummy_context()
|
||||
template = self._create_template()
|
||||
user_creds = create_user_creds(ctx)
|
||||
@ -3722,8 +3722,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
|
||||
|
||||
info_logger2 = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.INFO,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
|
||||
db_api.db_decrypt_parameters_and_properties(
|
||||
ctx, cfg.CONF.auth_encryption_key, verbose=False)
|
||||
|
||||
@ -2562,8 +2562,8 @@ class StackTest(common.HeatTestCase):
|
||||
''')
|
||||
warning_logger = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.WARNING,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
|
||||
cfg.CONF.set_override('encrypt_parameters_and_properties', False,
|
||||
enforce_type=True)
|
||||
|
||||
@ -433,8 +433,8 @@ class StackTest(common.HeatTestCase):
|
||||
def test_delete_stack_with_resource_log_is_clear(self):
|
||||
debug_logger = self.useFixture(
|
||||
fixtures.FakeLogger(level=logging.DEBUG,
|
||||
format="%(levelname)8s [%(name)s] %("
|
||||
"message)s"))
|
||||
format="%(levelname)8s [%(name)s] "
|
||||
"%(message)s"))
|
||||
tmpl = {'HeatTemplateFormatVersion': '2012-12-12',
|
||||
'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
|
||||
self.stack = stack.Stack(self.ctx, 'delete_log_test',
|
||||
|
||||
@ -48,16 +48,16 @@ HeatGroup = [
|
||||
cfg.StrOpt('auth_url',
|
||||
help="Full URI of the OpenStack Identity API (Keystone)"),
|
||||
cfg.StrOpt('user_domain_name',
|
||||
help="User domain name, if keystone v3 auth_url"
|
||||
help="User domain name, if keystone v3 auth_url "
|
||||
"is used"),
|
||||
cfg.StrOpt('project_domain_name',
|
||||
help="Project domain name, if keystone v3 auth_url"
|
||||
help="Project domain name, if keystone v3 auth_url "
|
||||
"is used"),
|
||||
cfg.StrOpt('user_domain_id',
|
||||
help="User domain id, if keystone v3 auth_url"
|
||||
help="User domain id, if keystone v3 auth_url "
|
||||
"is used"),
|
||||
cfg.StrOpt('project_domain_id',
|
||||
help="Project domain id, if keystone v3 auth_url"
|
||||
help="Project domain id, if keystone v3 auth_url "
|
||||
"is used"),
|
||||
cfg.StrOpt('region',
|
||||
help="The region name to use"),
|
||||
@ -125,7 +125,7 @@ HeatGroup = [
|
||||
help="Skip all functional tests"),
|
||||
cfg.ListOpt('skip_functional_test_list',
|
||||
help="List of functional test class or class.method "
|
||||
"names to skip ex. AutoscalingGroupTest,"
|
||||
"names to skip ex. AutoscalingGroupTest, "
|
||||
"InstanceGroupBasicTest.test_size_updates_work"),
|
||||
cfg.ListOpt('skip_scenario_test_list',
|
||||
help="List of scenario test class or class.method "
|
||||
@ -143,7 +143,7 @@ HeatGroup = [
|
||||
"server."),
|
||||
cfg.IntOpt('sighup_timeout',
|
||||
default=120,
|
||||
help="Timeout in seconds to wait for adding or removing child"
|
||||
help="Timeout in seconds to wait for adding or removing child "
|
||||
"process after receiving of sighup signal"),
|
||||
cfg.IntOpt('sighup_config_edit_retries',
|
||||
default=10,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user