From e8a05a8fd8d4a5cfb24f54a3daad41c79140420e Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Wed, 25 Jan 2017 14:49:07 +0100 Subject: [PATCH] Purge metric_collector toml files from previous version Change-Id: I17ee4dfa70c242daf16da91637f54ef1edbc4801 (cherry picked from commit 88323c91d3b984c8d358fbc62461ddad623bc988) --- .../puppet/manifests/controller.pp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp index 9d92935a3..04cc72ba7 100644 --- a/deployment_scripts/puppet/manifests/controller.pp +++ b/deployment_scripts/puppet/manifests/controller.pp @@ -288,6 +288,23 @@ if hiera('lma::collector::infrastructure_alerting::server', false) { virtual_hostname => '00-node-clusters', } + # Purge remaining files from previous 0.10.x version + $toml_metric_collector_to_purge = prefix([ + 'filter-afd_api_backends.toml', 'filter-afd_api_endpoints.toml', + 'filter-afd_service_rabbitmq_disk.toml', + 'filter-afd_service_rabbitmq_memory.toml', + 'filter-afd_service_rabbitmq_queue.toml', + 'filter-afd_workers.toml', + 'filter-service_heartbeat.toml', + 'encoder-nagios_gse_global_clusters.toml', + 'encoder-nagios_gse_node_clusters.toml', + 'output-nagios_gse_global_clusters.toml', + 'output-nagios_gse_node_clusters.toml', + ], '/etc/metric_collector/') + + file { $toml_metric_collector_to_purge: + ensure => absent, + } -> lma_collector::gse_nagios { 'services': openstack_deployment_name => $deployment_id, server => hiera('lma::collector::infrastructure_alerting::server'),