diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-02 05:45:42 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-03 01:14:45 +0100 |
| commit | fddd093d04d2744f5f7a7e09f8ed6f2e3d4d7119 (patch) | |
| tree | 827cbc137e8852705168b23c1bd136a50d3d17e5 /mcp | |
| parent | f5a14b9a0a33ad4e76ebfdf099a544ac87fcd963 (diff) | |
[patch] keystone: Use v3 for admin endpoint
Now that v2 API is obsolete, also switch 'admin' endpoint to v3
(previously it was kept back for OCL compatibility).
Change-Id: I9775d59d5e6b93d7351157f7550a0dd7114bee2f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch new file mode 100644 index 000000000..8731c1340 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch @@ -0,0 +1,35 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 2 Jan 2018 05:40:20 +0100 +Subject: [PATCH] Revert "Admin endpoint for keystone v3" + +Now that v2 API is obsolete, the 'admin' endpoint is unavailable, +forcing clients to try the next endpoint (i.e. 'public'), which +usually works, but implies external routing between mgmt and public +is in place. +For isolated networks, no valid endpoint is found. + +This reverts commit a045e8ef192b5a729e25c616cade70c2b0ad0761. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + keystone/client/service/keystone3.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml +index bd0c63b..cc385f2 100644 +--- a/keystone/client/service/keystone3.yml ++++ b/keystone/client/service/keystone3.yml +@@ -20,4 +20,4 @@ parameters: + internal_path: '/v3' + admin_address: ${_param:keystone_service_host} + admin_port: 35357 +- admin_path: '/v2.0' ++ admin_path: '/v3' |