nuke: remove packages before reboot

Just in case daemons coming up after reboot is problematic.
Related: http://tracker.ceph.com/issues/17027

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index f9b7887603c68eca7467efda9e411aa48ecadc3f..8d589c03be3cf21df98549a2ac82bc6fc4c16b93 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -694,6 +694,8 @@ def nuke_helper(ctx, should_unlock):
     log.info('Unmount ceph-fuse and killing daemons...')
     shutdown_daemons(ctx)
     log.info('All daemons killed.')
+    # Try to remove packages before reboot
+    remove_installed_packages(ctx)
 
     remotes = ctx.cluster.remotes.keys()
     reboot(ctx, remotes)
@@ -729,5 +731,6 @@ def nuke_helper(ctx, should_unlock):
     remove_testing_tree(ctx)
     log.info('Filesystem cleared.')
     remove_yum_timedhosts(ctx)
+    # Once again remove packages after reboot
     remove_installed_packages(ctx)
     log.info('Installed packages removed.')