Update default domain's description
The default domain's description references v2. This is wrong in v3-only deployments, or when CONF.identity.default_domain_id is used to specify a different domain for v2. This change updates the description. Change-Id: Ia8357bea00e3273015968015cdffa59d98a19159 Closes-Bug: #1546605
This commit is contained in:
parent
08f8db34ca
commit
52080a8f8f
@ -131,8 +131,7 @@ class BootStrap(BaseApp):
|
||||
'id': CONF.identity.default_domain_id,
|
||||
'name': 'Default',
|
||||
'enabled': True,
|
||||
'description': 'Owns users and tenants (i.e. projects) available '
|
||||
'on Identity API v2.'
|
||||
'description': 'The default domain'
|
||||
}
|
||||
try:
|
||||
self.resource_manager.create_domain(
|
||||
|
@ -38,8 +38,7 @@ MEMOIZE = cache.get_memoization_decorator(group='resource')
|
||||
|
||||
def calc_default_domain():
|
||||
return {'description':
|
||||
(u'Owns users and tenants (i.e. projects)'
|
||||
' available on Identity API v2.'),
|
||||
(u'The default domain'),
|
||||
'enabled': True,
|
||||
'id': CONF.identity.default_domain_id,
|
||||
'name': u'Default'}
|
||||
|
@ -143,8 +143,7 @@ ROLE_ASSIGNMENTS = [
|
||||
]
|
||||
|
||||
DOMAINS = [{'description':
|
||||
(u'Owns users and tenants (i.e. projects)'
|
||||
' available on Identity API v2.'),
|
||||
(u'The default domain'),
|
||||
'enabled': True,
|
||||
'id': DEFAULT_DOMAIN_ID,
|
||||
'name': u'Default'}]
|
||||
|
@ -301,8 +301,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
|
||||
self.resource_api.get_domain(DEFAULT_DOMAIN_ID)
|
||||
except exception.DomainNotFound:
|
||||
domain = unit.new_domain_ref(
|
||||
description=(u'Owns users and tenants (i.e. projects)'
|
||||
u' available on Identity API v2.'),
|
||||
description=(u'The default domain'),
|
||||
id=DEFAULT_DOMAIN_ID,
|
||||
name=u'Default')
|
||||
self.resource_api.create_domain(DEFAULT_DOMAIN_ID, domain)
|
||||
|
Loading…
Reference in New Issue
Block a user