polish dashboard config & service mgmt

re PR sensu#401 among other things
dhgwilliam · Aug 18, 2015 · 4b5cddc · 4b5cddc
1 parent 80b59da
commit 4b5cddc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/manifests/enterprise/dashboard/config.pp b/manifests/enterprise/dashboard/config.pp
@@ -3,14 +3,24 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  if $sensu::purge_config and !$sensu::enterprise_dashboard {
-    $ensure = 'absent'
+  if $sensu::purge and !$sensu::enterprise_dashboard {
+    if is_hash($sensu::purge) and $::sensu::purge['config'] {
+      $ensure = 'absent'
+    } else {
+      $ensure = 'present'
+    }
   } else {
     $ensure = 'present'
   }
 
+  if $ensure == 'present' {
+    $_ensure = 'file'
+  } else {
+    $_ensure = $ensure
+  }
+
   file { '/etc/sensu/dashboard.json':
-    ensure => file,
+    ensure => $_ensure,
     owner  => 'sensu',
     group  => 'sensu',
     mode   => '0440',

diff --git a/manifests/enterprise/dashboard/service.pp b/manifests/enterprise/dashboard/service.pp
@@ -11,7 +11,7 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  if $::sensu::manage_services and $::sensu::enterprise_dashboard {
+  if $::sensu::manage_services {
     case $::sensu::enterprise_dashboard {
       true: {
         $ensure = 'running'