diff options
Diffstat (limited to 'mcp/patches/reclass-system-salt-model')
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch (renamed from mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch) | 2 | ||||
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch | 31 | ||||
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch (renamed from mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch) | 2 |
3 files changed, 2 insertions, 33 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/0001-Use-keystone-v3-endpoints-by-default.patch index b22951a8f..514ea59e4 100644 --- a/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch +++ b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch @@ -20,7 +20,7 @@ Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone/client/single.yml b/keystone/client/single.yml -index a79ed7e..86b4e09 100644 +index a79ed7ec..86b4e09e 100644 --- a/keystone/client/single.yml +++ b/keystone/client/single.yml @@ -4,7 +4,7 @@ classes: diff --git a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch deleted file mode 100644 index ab818df70..000000000 --- a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch +++ /dev/null @@ -1,31 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 <Alexandru.Avadanii@enea.com> -Date: Tue, 6 Mar 2018 22:40:06 +0100 -Subject: [PATCH] ceilometer:server:publisher: Add 'enabled' default - -Fixes: #306 - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ceilometer/server/cluster.yml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml -index 11488fb..2d19e31 100644 ---- a/ceilometer/server/cluster.yml -+++ b/ceilometer/server/cluster.yml -@@ -14,6 +14,7 @@ parameters: - ttl: 86400 - publisher: - default: -+ enabled: false - bind: - host: ${_param:cluster_local_address} - port: 8777 diff --git a/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch index d0ddc58c2..00b4cf34b 100644 --- a/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch +++ b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch @@ -24,7 +24,7 @@ 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 5138c4f..9b69294 100644 +index 5138c4fc..9b69294b 100644 --- a/keystone/client/service/keystone3.yml +++ b/keystone/client/service/keystone3.yml @@ -22,5 +22,5 @@ parameters: |