X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testsuites%2Frubbos%2Fpuppet_manifests%2Fmodules%2Frubbos_monitor%2Fmanifests%2Frubbos_monitor_off.pp;h=b70723111f1200860079c653096139718babaa93;hb=4ec71cc3e334b42e0257ec8cf8a85a778a817e56;hp=ed8dabbf10843c6c804dc345760c941003fb77bf;hpb=922c3005c3e60a1e570bf98589f9ecf9c35bacb9;p=bottlenecks.git

diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp
index ed8dabbf..b7072311 100644
--- a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp
+++ b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp
@@ -14,23 +14,40 @@ class rubbos_monitor::rubbos_monitor_off {
 
   # Declare some variables
   $rubbos_app           = $params::rubbos_params::rubbos_app
+  $rubbos_home          = $params::rubbos_params::rubbos_home
 
   # Make uninstall sysstat
   exec {'make uninstall sysstat':
         cwd     => "${rubbos_app}/sysstat-9.0.6",
         command => "make uninstall",
-	path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
-	onlyif	=> "test -d ${rubbos_app}/sysstat-9.0.6",
+        path    => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"],
+        onlyif  => "test -d ${rubbos_app}/sysstat-9.0.6",
   }
 
-  # Remove folder
+  # Remove sysstat-9.0.6 folder
   file {'${rubbos_app}/sysstat-9.0.6':
         ensure  => absent,
         path    => "${rubbos_app}/sysstat-9.0.6",
         force   => true,
-	recurse	=> true,
+        recurse => true,
         backup  => false,
-        require	=> Exec['make uninstall sysstat'],
+        require => Exec['make uninstall sysstat'],
+  }
+
+  # Remove bench folder
+  file {'${rubbos_home}/bench.tar.gz':
+        ensure  => absent,
+        path    => "${rubbos_home}/bench.tar.gz",
+        backup  => false,
+  }
+
+  file {'${rubbos_home}/bench':
+        ensure          => absent,
+        path            => "${rubbos_home}/bench",
+        force           => true,
+        recurse         => true,
+        backup          => false,
+        show_diff       => false,
   }
 
 }