Revision 923e6582
b/astakosclient/astakosclient/__init__.py | ||
---|---|---|
71 | 71 |
|
72 | 72 |
# -------------------------------------------------------------------- |
73 | 73 |
# Astakos Keystone API urls |
74 |
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
|
|
75 |
API_TOKENS = join_urls(KEYSTONE_PREFIX, "tokens")
|
|
74 |
IDENTITY_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
|
|
75 |
API_TOKENS = join_urls(IDENTITY_PREFIX, "tokens")
|
|
76 | 76 |
TOKENS_ENDPOINTS = join_urls(API_TOKENS, "endpoints") |
77 | 77 |
|
78 | 78 |
|
b/astakosclient/astakosclient/services.py | ||
---|---|---|
52 | 52 |
}, |
53 | 53 |
}, |
54 | 54 |
|
55 |
'astakos_keystone': {
|
|
55 |
'astakos_identity': {
|
|
56 | 56 |
'type': 'identity', |
57 | 57 |
'component': 'astakos', |
58 | 58 |
'prefix': 'identity', |
b/docs/astakos-api-guide.rst | ||
---|---|---|
402 | 402 |
"publicURL": "https://accounts.example.synnefo.org/identity/v2.0", |
403 | 403 |
"versionId": "v2.0"}], |
404 | 404 |
"endpoints_links": [], |
405 |
"name": "astakos_keystone",
|
|
405 |
"name": "astakos_identity",
|
|
406 | 406 |
"type": "identity"}], |
407 | 407 |
"token": { |
408 | 408 |
"expires": "2013-06-19T15:23:59.975572+00:00", |
... | ... | |
457 | 457 |
versionId="v1.0" |
458 | 458 |
publicURL="https://accounts.example.synnefo.org/account/v1.0" |
459 | 459 |
</service> |
460 |
<service type="identity" name="astakos_keystone" SNF:uiURL="">
|
|
460 |
<service type="identity" name="astakos_identity" SNF:uiURL="">
|
|
461 | 461 |
<endpoint |
462 | 462 |
versionId="v2.0" |
463 | 463 |
publicURL="https://accounts.example.synnefo.org/identity/v2.0" |
b/snf-astakos-app/astakos/im/settings.py | ||
---|---|---|
19 | 19 |
fill_endpoints(astakos_services, BASE_URL) |
20 | 20 |
ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') |
21 | 21 |
VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') |
22 |
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
|
|
22 |
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
|
|
23 | 23 |
|
24 | 24 |
# Set the expiration time of newly created auth tokens |
25 | 25 |
# to be this many hours after their creation time. |
b/snf-astakos-app/astakos/scripts/snf_service_export.py | ||
---|---|---|
25 | 25 |
}, |
26 | 26 |
}, |
27 | 27 |
|
28 |
'astakos_keystone': {
|
|
28 |
'astakos_identity': {
|
|
29 | 29 |
'type': 'identity', |
30 | 30 |
'component': 'astakos', |
31 | 31 |
'prefix': 'identity', |
b/snf-cyclades-app/synnefo/cyclades_settings.py | ||
---|---|---|
81 | 81 |
|
82 | 82 |
ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') |
83 | 83 |
ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') |
84 |
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
|
|
84 |
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
|
|
85 | 85 |
|
86 | 86 |
|
87 | 87 |
# Proxy Astakos settings |
b/snf-pithos-app/pithos/api/settings.py | ||
---|---|---|
34 | 34 |
|
35 | 35 |
ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix') |
36 | 36 |
ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix') |
37 |
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
|
|
37 |
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_identity.prefix')
|
|
38 | 38 |
|
39 | 39 |
BASE_ASTAKOS_PROXY_PATH = getattr(settings, 'PITHOS_BASE_ASTAKOS_PROXY_PATH', |
40 | 40 |
ASTAKOS_BASE_PATH) |
Also available in: Unified diff