Merge pull request #69 from Sharpie/fix-ensure-absent

jarretlavallee · web-flow · commit a03f4511a0ca · 2020-10-28T12:32:01.000-06:00
Fix ensure =&gt; absent for metrics
diff --git a/manifests/pe_metric.pp b/manifests/pe_metric.pp
@@ -26,6 +26,8 @@
 
   file { $metrics_output_dir :
     ensure => $metrics_output_dir_ensure,
+    # Allow directories to be removed.
+    force  => true,
   }
 
   $config_hash = {
diff --git a/manifests/sar_metric.pp b/manifests/sar_metric.pp
@@ -18,6 +18,8 @@
 
   file { $metrics_output_dir :
     ensure => $metrics_output_dir_ensure,
+    # Allow directories to be removed.
+    force  => true,
   }
 
   $metric_script_file_path = "${puppet_metrics_collector::system::scripts_dir}/${metric_script_file}"

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`
`27`	`27`	`file { $metrics_output_dir :`
`28`	`28`	`ensure => $metrics_output_dir_ensure,`
	`29`	`+ # Allow directories to be removed.`
	`30`	`+ force => true,`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`$config_hash = {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`
`19`	`19`	`file { $metrics_output_dir :`
`20`	`20`	`ensure => $metrics_output_dir_ensure,`
	`21`	`+ # Allow directories to be removed.`
	`22`	`+ force => true,`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`$metric_script_file_path = "${puppet_metrics_collector::system::scripts_dir}/${metric_script_file}"`