summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-28 13:22:58 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-28 13:25:01 +0400
commit2b62cfb434b720d869f81c9f66e20fa0c8dc2daa (patch)
treec9b0791309ec1f32d825696a4ad7343a9885853e /mcp/patches
parente016aec95fb278ae02f0ac96814182dd6a2f50cd (diff)
[patch] Use keystone v3 endpoints by default
Change-Id: I98fc378fbec3679acf5bad4c089972340daea92c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch
new file mode 100644
index 000000000..73fafdb3f
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch
@@ -0,0 +1,31 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Michael Polenchuk <mpolenchuk@mirantis.com>
+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
+
+diff --git a/keystone/client/single.yml b/keystone/client/single.yml
+index ebf5b5ff..80077105 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:
+ linux: