From: Alexandru Avadanii Date: Tue, 6 Mar 2018 19:03:53 +0000 (+0100) Subject: [patch] Fixup ceilometer server publisher default X-Git-Tag: opnfv-6.0.0~53 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F53185%2F1;p=fuel.git [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 --- diff --git a/.gitmodules b/.gitmodules index 565943da6..c7c44587c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,6 @@ path = mcp/reclass/classes/system url = https://github.com/Mirantis/reclass-system-salt-model branch = master - ignore = all [submodule "scripts"] path = mcp/deploy/scripts url = https://github.com/salt-formulas/salt-formulas-scripts 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 +Date: Tue, 6 Mar 2018 22:40:06 +0100 +Subject: [PATCH] ceilometer:server:publisher: Add 'enabled' default + +Fixes: #306 + +Signed-off-by: Alexandru Avadanii +--- + 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-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch similarity index 100% rename from mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch rename to mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch diff --git a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch b/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch deleted file mode 100644 index e77496001..000000000 --- a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch +++ /dev/null @@ -1,37 +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 -Date: Sun, 10 Dec 2017 21:58:52 +0100 -Subject: [PATCH] mongodb: Parameterize cluster hostnames - -Replace mdb{01,02,03} with reclass params, similar to prev commit. - -Signed-off-by: Alexandru Avadanii ---- - mongodb/server/cluster.yml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mongodb/server/cluster.yml b/mongodb/server/cluster.yml -index f3c16d6..1d1e397 100644 ---- a/mongodb/server/cluster.yml -+++ b/mongodb/server/cluster.yml -@@ -3,9 +3,9 @@ classes: - parameters: - _param: - mongodb_server_replica_set: mongodb -- mongodb_master: mdb01 -+ mongodb_master: ${_param:openstack_telemetry_node01_hostname} - mongodb_server_members: -- - host: mdb01 -+ - host: ${_param:openstack_telemetry_node01_hostname} - priority: 2 -- - host: mdb02 -- - host: mdb03 -+ - host: ${_param:openstack_telemetry_node02_hostname} -+ - host: ${_param:openstack_telemetry_node03_hostname} diff --git a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch similarity index 100% rename from mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch rename to mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index a798f6aec..20afa5cea 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit a798f6aecd54642865b19752a7f22d2ad3a36ace +Subproject commit 20afa5cea210bf6b991dc6ed394d3378bf98c130