summaryrefslogtreecommitdiffstats
path: root/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-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/0001-ceilometer-server-publisher-Add-enabled-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/0001-ceilometer-server-publisher-Add-enabled-default.patch')
-rw-r--r--mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch31
1 files changed, 31 insertions, 0 deletions
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
new file mode 100644
index 000000000..ab818df70
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch
@@ -0,0 +1,31 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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