openstack
/
magnum
Code Issues Proposed changes

Merge "Add missing ws separator between words"

This commit is contained in:
Zuul 2019-03-11 22:17:41 +00:00 committed by Gerrit Code Review
parent 2595fda3e3 e0ed301869
commit 988cbb8b49
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/api/utils.py
View File

@ -64,7 +64,7 @@ def validate_docker_memory(mem_str):
"<number>[<unit>]," "<number>[<unit>],"
"where unit = b, k, m or g")) "where unit = b, k, m or g"))
if mem < DOCKER_MINIMUM_MEMORY: 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.") "allowed is %d B.")
% DOCKER_MINIMUM_MEMORY) % DOCKER_MINIMUM_MEMORY)

2
magnum/common/exception.py
View File

@ -390,7 +390,7 @@ class FederationAlreadyExists(Conflict):
class MemberAlreadyExists(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.") "federation %(federation_name)s.")

2
magnum/common/urlfetch.py
View File

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

2
magnum/conf/trust.py
View File

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