summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-27 14:56:16 +0000
committerGerrit Code Review <review@openstack.org>2017-01-27 14:56:16 +0000
commita4a0e3284aa2c623be47a7222d440a1184ff3e76 (patch)
treeecd6f32362063645a26dbd2b867b9c0dbc33c672
parentb8780f88daa9becac6bf808cbc2b7df707f23f18 (diff)
parente8a05a8fd8d4a5cfb24f54a3daad41c79140420e (diff)
Merge "Purge metric_collector toml files from previous version" into stable/1.01.0.0rc3
-rw-r--r--deployment_scripts/puppet/manifests/controller.pp17
1 files changed, 17 insertions, 0 deletions
diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index 9d92935..04cc72b 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) {
288 virtual_hostname => '00-node-clusters', 288 virtual_hostname => '00-node-clusters',
289 } 289 }
290 290
291 # Purge remaining files from previous 0.10.x version
292 $toml_metric_collector_to_purge = prefix([
293 'filter-afd_api_backends.toml', 'filter-afd_api_endpoints.toml',
294 'filter-afd_service_rabbitmq_disk.toml',
295 'filter-afd_service_rabbitmq_memory.toml',
296 'filter-afd_service_rabbitmq_queue.toml',
297 'filter-afd_workers.toml',
298 'filter-service_heartbeat.toml',
299 'encoder-nagios_gse_global_clusters.toml',
300 'encoder-nagios_gse_node_clusters.toml',
301 'output-nagios_gse_global_clusters.toml',
302 'output-nagios_gse_node_clusters.toml',
303 ], '/etc/metric_collector/')
304
305 file { $toml_metric_collector_to_purge:
306 ensure => absent,
307 } ->
291 lma_collector::gse_nagios { 'services': 308 lma_collector::gse_nagios { 'services':
292 openstack_deployment_name => $deployment_id, 309 openstack_deployment_name => $deployment_id,
293 server => hiera('lma::collector::infrastructure_alerting::server'), 310 server => hiera('lma::collector::infrastructure_alerting::server'),