From 63e6d87db4b7bd03013a72f9fc3d2ef2e59761bb Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 5 Aug 2015 16:54:49 -0600 Subject: [PATCH] calamari_setup: handle RHCS 1.2 (missing /mnt/MON) In RHCS 1.2 we don't have a /mnt/MON directory. The intention of 35c6363a1eaf5011e26be8561ffcd4e9324d13a2 was to handle this condition, but in 1.2, the non-zero return code makes Teuthology fail the whole test. We don't want *Teuthology* itself to act on the return code here; we simply want to know what it was and structure the rest of the test accordingly. --- tasks/calamari_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py index fd3ef4e395995..628df2eca4849 100644 --- a/tasks/calamari_setup.py +++ b/tasks/calamari_setup.py @@ -345,7 +345,7 @@ def deploy_ceph(ctx, cal_svr): # created local repos at all, but that is the subject of a future # change.) - r = cal_svr.run(args='/usr/bin/test -d /mnt/MON') + r = cal_svr.run(args='/usr/bin/test -d /mnt/MON', check_status=False) use_install_repo = (r.returncode == 0) # pre-1.3: -- 2.39.5