From 0c8eca1990726b3dfcf0572aedda5cf3f62a1f49 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 (cherry picked from commit 0a8568d9f170d6c3b42d2dd35db440b4251f9a5d) --- ...0001-Use-keystone-v3-endpoints-by-default.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch (limited to 'mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch') diff --git a/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch new file mode 100644 index 000000000..514ea59e4 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch @@ -0,0 +1,34 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Michael Polenchuk +Date: Thu, 28 Dec 2017 12:49:33 +0400 +Subject: [PATCH] Use keystone v3 endpoints by default + +The v2.0 auth API has been already marked as deprecated in the +Mitaka release and will be removed in the "T" release. +The v3 API should be used instead. + +Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 +--- + keystone/client/single.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keystone/client/single.yml b/keystone/client/single.yml +index a79ed7ec..86b4e09e 100644 +--- a/keystone/client/single.yml ++++ b/keystone/client/single.yml +@@ -4,7 +4,7 @@ classes: + - system.keystone.client.service.glance + - system.keystone.client.service.heat + - system.keystone.client.service.heat-cfn +-- system.keystone.client.service.keystone ++- system.keystone.client.service.keystone3 + - system.keystone.client.service.neutron + parameters: + _param: -- cgit 1.2.3-korg