diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py index 4096e03e52..eaf1ffe1b1 100644 --- a/keystone/cmd/cli.py +++ b/keystone/cmd/cli.py @@ -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( diff --git a/keystone/resource/core.py b/keystone/resource/core.py index 4ae191ce68..6c0505d6db 100644 --- a/keystone/resource/core.py +++ b/keystone/resource/core.py @@ -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'} diff --git a/keystone/tests/unit/default_fixtures.py b/keystone/tests/unit/default_fixtures.py index afd8b42ff4..e5ca236e2a 100644 --- a/keystone/tests/unit/default_fixtures.py +++ b/keystone/tests/unit/default_fixtures.py @@ -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'}] diff --git a/keystone/tests/unit/test_v3.py b/keystone/tests/unit/test_v3.py index 8a71f2e741..91b118fe08 100644 --- a/keystone/tests/unit/test_v3.py +++ b/keystone/tests/unit/test_v3.py @@ -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)