Browse Source

Merge "Add missing ws separator between words"

changes/78/631378/14
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
988cbb8b49
  1. 2
      magnum/api/utils.py
  2. 2
      magnum/common/exception.py
  3. 2
      magnum/common/urlfetch.py
  4. 2
      magnum/conf/trust.py

2
magnum/api/utils.py

@ -64,7 +64,7 @@ def validate_docker_memory(mem_str):
"<number>[<unit>],"
"where unit = b, k, m or g"))
if mem < DOCKER_MINIMUM_MEMORY:
raise wsme.exc.ClientSideError(_("Docker Minimum memory limit"
raise wsme.exc.ClientSideError(_("Docker Minimum memory limit "
"allowed is %d B.")
% DOCKER_MINIMUM_MEMORY)

2
magnum/common/exception.py

@ -390,7 +390,7 @@ class FederationAlreadyExists(Conflict):
class MemberAlreadyExists(Conflict):
message = _("A cluster with UUID %(uuid)s is already a member of the"
message = _("A cluster with UUID %(uuid)s is already a member of the "
"federation %(federation_name)s.")

2
magnum/common/urlfetch.py

@ -68,7 +68,7 @@ def get(url, allowed_schemes=('http', 'https')):
for chunk in reader:
result += chunk
if len(result) > CONF.max_manifest_size:
raise URLFetchError("Manifest exceeds maximum allowed"
raise URLFetchError("Manifest exceeds maximum allowed "
"size (%s bytes)" %
CONF.max_manifest_size)
return result

2
magnum/conf/trust.py

@ -28,7 +28,7 @@ trust_opts = [
' since the trust gives instances OpenStack API access'
" to the cluster's project. Note that this setting"
' does not affect per-cluster trusts assigned to the'
'Magnum service user.')),
' Magnum service user.')),
cfg.StrOpt('trustee_domain_id',
help=_('Id of the domain to create trustee for clusters')),
cfg.StrOpt('trustee_domain_name',

Loading…
Cancel
Save