summaryrefslogtreecommitdiffstats
path: root/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-06 20:03:53 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-06 22:50:38 +0100
commit4608ea751ebbe43479e60215599eae506fd3b963 (patch)
tree39b7b061e8afadc0b0350cc677f3fd99f5644b2d /mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
parent86e9d8de2e3174438c5e640e0bd27d59d003126b (diff)
[patch] Fixup ceilometer server publisher default
- backport proposed fixup for ceilometer; - remove 'ignore: all' from .gitmodules to make it easier to bump the submodule; - bump system submodule to upstream latest; - drop patch merged upstream; JIRA: FUEL-350 Change-Id: I68f232e0da5af368a1669a7379eedde5c4168b84 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch')
-rw-r--r--mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
new file mode 100644
index 000000000..b22951a8f
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0002-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 <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
+---
+ 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 a79ed7e..86b4e09 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: