openstack
/
keystone
Code Issues Proposed changes

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:
Anna Sortland 2016-02-17 11:33:51 -05:00 committed by Steve Martinelli
parent 08f8db34ca
commit 52080a8f8f
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keystone/cmd/cli.py
View File

@ -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(

3
keystone/resource/core.py
View File

@ -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'}

3
keystone/tests/unit/default_fixtures.py
View File

@ -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'}]

3
keystone/tests/unit/test_v3.py
View File

@ -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)