Commit fcace70b authored by Georgios D. Tsoukalas's avatar Georgios D. Tsoukalas

Rename astakos_keystone to astakos_identity

parent 0de4ed8d
...@@ -71,8 +71,8 @@ API_FEEDBACK = join_urls(ACCOUNTS_PREFIX, "feedback") ...@@ -71,8 +71,8 @@ API_FEEDBACK = join_urls(ACCOUNTS_PREFIX, "feedback")
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Astakos Keystone API urls # Astakos Keystone API urls
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix') IDENTITY_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
API_TOKENS = join_urls(KEYSTONE_PREFIX, "tokens") API_TOKENS = join_urls(IDENTITY_PREFIX, "tokens")
TOKENS_ENDPOINTS = join_urls(API_TOKENS, "endpoints") TOKENS_ENDPOINTS = join_urls(API_TOKENS, "endpoints")
......
...@@ -52,7 +52,7 @@ astakos_services = { ...@@ -52,7 +52,7 @@ astakos_services = {
}, },
}, },
'astakos_keystone': { 'astakos_identity': {
'type': 'identity', 'type': 'identity',
'component': 'astakos', 'component': 'astakos',
'prefix': 'identity', 'prefix': 'identity',
......
...@@ -402,7 +402,7 @@ Example json response: ...@@ -402,7 +402,7 @@ Example json response:
"publicURL": "https://accounts.example.synnefo.org/identity/v2.0", "publicURL": "https://accounts.example.synnefo.org/identity/v2.0",
"versionId": "v2.0"}], "versionId": "v2.0"}],
"endpoints_links": [], "endpoints_links": [],
"name": "astakos_keystone", "name": "astakos_identity",
"type": "identity"}], "type": "identity"}],
"token": { "token": {
"expires": "2013-06-19T15:23:59.975572+00:00", "expires": "2013-06-19T15:23:59.975572+00:00",
...@@ -457,7 +457,7 @@ Example xml response: ...@@ -457,7 +457,7 @@ Example xml response:
versionId="v1.0" versionId="v1.0"
publicURL="https://accounts.example.synnefo.org/account/v1.0" publicURL="https://accounts.example.synnefo.org/account/v1.0"
</service> </service>
<service type="identity" name="astakos_keystone" SNF:uiURL=""> <service type="identity" name="astakos_identity" SNF:uiURL="">
<endpoint <endpoint
versionId="v2.0" versionId="v2.0"
publicURL="https://accounts.example.synnefo.org/identity/v2.0" publicURL="https://accounts.example.synnefo.org/identity/v2.0"
......
...@@ -19,7 +19,7 @@ astakos_services = deepcopy(vanilla_astakos_services) ...@@ -19,7 +19,7 @@ astakos_services = deepcopy(vanilla_astakos_services)
fill_endpoints(astakos_services, BASE_URL) fill_endpoints(astakos_services, BASE_URL)
ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix')
VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix')
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix') KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
# Set the expiration time of newly created auth tokens # Set the expiration time of newly created auth tokens
# to be this many hours after their creation time. # to be this many hours after their creation time.
......
...@@ -25,7 +25,7 @@ astakos_services = { ...@@ -25,7 +25,7 @@ astakos_services = {
}, },
}, },
'astakos_keystone': { 'astakos_identity': {
'type': 'identity', 'type': 'identity',
'component': 'astakos', 'component': 'astakos',
'prefix': 'identity', 'prefix': 'identity',
......
...@@ -81,7 +81,7 @@ for path, value in CUSTOMIZE_ASTAKOS_SERVICES: ...@@ -81,7 +81,7 @@ for path, value in CUSTOMIZE_ASTAKOS_SERVICES:
ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix')
ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix')
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix') ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
# Proxy Astakos settings # Proxy Astakos settings
......
...@@ -34,7 +34,7 @@ for path, value in CUSTOMIZE_ASTAKOS_SERVICES: ...@@ -34,7 +34,7 @@ for path, value in CUSTOMIZE_ASTAKOS_SERVICES:
ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix')
ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix')
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix') ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
BASE_ASTAKOS_PROXY_PATH = getattr(settings, 'PITHOS_BASE_ASTAKOS_PROXY_PATH', BASE_ASTAKOS_PROXY_PATH = getattr(settings, 'PITHOS_BASE_ASTAKOS_PROXY_PATH',
ASTAKOS_BASE_PATH) ASTAKOS_BASE_PATH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment