From 0a8568d9f170d6c3b42d2dd35db440b4251f9a5d Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 11 Apr 2018 16:50:28 +0400 Subject: Clean up opendaylight configuration * remove client patch (has been merged to upstream) * websocket now is disabled by default * purge deprecated/unneeded features (odl-mdsal-apidocs, odl-dlux-all) Change-Id: Id247a3c74e66730049bfeafc4a5164aad0d9b662 Signed-off-by: Michael Polenchuk --- ...002-Revert-Admin-endpoint-for-keystone-v3.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch (limited to 'mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch') diff --git a/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch new file mode 100644 index 000000000..00b4cf34b --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch @@ -0,0 +1,36 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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 +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 +--- + 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 5138c4fc..9b69294b 100644 +--- a/keystone/client/service/keystone3.yml ++++ b/keystone/client/service/keystone3.yml +@@ -22,5 +22,5 @@ parameters: + internal_protocol: ${_param:keystone_service_protocol} + admin_address: ${_param:keystone_service_host} + admin_port: 35357 +- admin_path: '/v2.0' ++ admin_path: '/v3' + admin_protocol: ${_param:keystone_service_protocol} -- cgit 1.2.3-korg