qa: turn fail_fs off in case default changes

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/+ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml
index 9b21958bebc79ce3c3e36d520532bcd71f1615d3..fbde19a221e1c44d92cced1994f6b39f98db75a6 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml
@@ -1,9 +1,15 @@
 teuthology:
   premerge: |
-            if not yaml.teuthology.variables.fail_fs then reject() end
+            local set = yaml.teuthology.variables.fail_fs
+            local cmd = "ceph config set mgr mgr/orchestrator/fail_fs "..tostring(set)
+            local cmds = yaml_fragment['upgrade-tasks'].sequential[0]['cephadm.shell']['host.a']
+            if set then
+              py_attrgetter(cmds).append "ceph config set mgr mgr/orchestrator/fail_fs true"
+            else
+              py_attrgetter(cmds).append "ceph config set mgr mgr/orchestrator/fail_fs false || true"
+            end
 upgrade-tasks:
   sequential:
     - cephadm.shell:
         env: [sha1]
-        host.a:
-          - ceph config set mgr mgr/orchestrator/fail_fs true
\ No newline at end of file
+        host.a: []