Merge "Update default domain's description"
This commit is contained in:
commit
2707f8ffb0
@ -131,8 +131,7 @@ class BootStrap(BaseApp):
|
|||||||
'id': CONF.identity.default_domain_id,
|
'id': CONF.identity.default_domain_id,
|
||||||
'name': 'Default',
|
'name': 'Default',
|
||||||
'enabled': True,
|
'enabled': True,
|
||||||
'description': 'Owns users and tenants (i.e. projects) available '
|
'description': 'The default domain'
|
||||||
'on Identity API v2.'
|
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
self.resource_manager.create_domain(
|
self.resource_manager.create_domain(
|
||||||
|
@ -38,8 +38,7 @@ MEMOIZE = cache.get_memoization_decorator(group='resource')
|
|||||||
|
|
||||||
def calc_default_domain():
|
def calc_default_domain():
|
||||||
return {'description':
|
return {'description':
|
||||||
(u'Owns users and tenants (i.e. projects)'
|
(u'The default domain'),
|
||||||
' available on Identity API v2.'),
|
|
||||||
'enabled': True,
|
'enabled': True,
|
||||||
'id': CONF.identity.default_domain_id,
|
'id': CONF.identity.default_domain_id,
|
||||||
'name': u'Default'}
|
'name': u'Default'}
|
||||||
|
@ -143,8 +143,7 @@ ROLE_ASSIGNMENTS = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
DOMAINS = [{'description':
|
DOMAINS = [{'description':
|
||||||
(u'Owns users and tenants (i.e. projects)'
|
(u'The default domain'),
|
||||||
' available on Identity API v2.'),
|
|
||||||
'enabled': True,
|
'enabled': True,
|
||||||
'id': DEFAULT_DOMAIN_ID,
|
'id': DEFAULT_DOMAIN_ID,
|
||||||
'name': u'Default'}]
|
'name': u'Default'}]
|
||||||
|
@ -301,8 +301,7 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
|
|||||||
self.resource_api.get_domain(DEFAULT_DOMAIN_ID)
|
self.resource_api.get_domain(DEFAULT_DOMAIN_ID)
|
||||||
except exception.DomainNotFound:
|
except exception.DomainNotFound:
|
||||||
domain = unit.new_domain_ref(
|
domain = unit.new_domain_ref(
|
||||||
description=(u'Owns users and tenants (i.e. projects)'
|
description=(u'The default domain'),
|
||||||
u' available on Identity API v2.'),
|
|
||||||
id=DEFAULT_DOMAIN_ID,
|
id=DEFAULT_DOMAIN_ID,
|
||||||
name=u'Default')
|
name=u'Default')
|
||||||
self.resource_api.create_domain(DEFAULT_DOMAIN_ID, domain)
|
self.resource_api.create_domain(DEFAULT_DOMAIN_ID, domain)
|
||||||
|
Loading…
Reference in New Issue
Block a user