From: Sage Weil <sage@redhat.com>
Date: Thu, 25 May 2017 22:05:42 +0000 (-0400)
Subject: qa/tasks/repair_test: unset flags we set
X-Git-Tag: v12.1.0~57^2~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15296%2Fhead;p=ceph.git

qa/tasks/repair_test: unset flags we set

In particular, noscrub and nodeepscrub leave a health
warning, which prevents shutdown with at-end.yaml.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/repair_test.py b/qa/tasks/repair_test.py
index b05ea3748d83..26851e25e3de 100644
--- a/qa/tasks/repair_test.py
+++ b/qa/tasks/repair_test.py
@@ -303,3 +303,6 @@ def task(ctx, config):
     repair_test_2(ctx, manager, config, choose_replica)
 
     repair_test_erasure_code(manager, hinfoerr, 'primary', "deep-scrub")
+
+    manager.raw_cluster_cmd('osd', 'unset', 'noscrub')
+    manager.raw_cluster_cmd('osd', 'unset', 'nodeep-scrub')