From 8621846f46b63ac6b2276cbb105331ae0a34dec8 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 30 Jan 2018 13:36:09 +0400
Subject: Update reclass system model
Get the latest reclass system model to be in sync with salt
formulas code. Adjust keystone v3 admin endpoint patch.
Change-Id: Ia7ce6187b875cc9e18af2784ef1eb5df1c145c7d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
.../0004-Revert-Admin-endpoint-for-keystone-v3.patch | 9 +++++----
mcp/reclass/classes/system | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'mcp')
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
index 8731c1340..00b4cf34b 100644
--- 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
@@ -1,5 +1,5 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+: 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
@@ -24,12 +24,13 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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
+index 5138c4fc..9b69294b 100644
--- a/keystone/client/service/keystone3.yml
+++ b/keystone/client/service/keystone3.yml
-@@ -20,4 +20,4 @@ parameters:
- internal_path: '/v3'
+@@ -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}
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 4a5c3dec8..86594f66e 160000
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 4a5c3dec811bfdbbd7c3f9d20d53e4a95842f6ba
+Subproject commit 86594f66eb239eda9424b58c96914fdb27e3e7ff
--
cgit