From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Oct 2019 18:12:26 +0000 (-0500)
Subject: qa/suites/rados/thrash-old-clients: exclude ceph-daemon on nautilus installs
X-Git-Tag: v15.1.0~1283^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30817%2Fhead;p=ceph.git

qa/suites/rados/thrash-old-clients: exclude ceph-daemon on nautilus installs

i did the original addition by grepping for ceph-mgr-ssh, but that's
included in nautilus so I missed this one!

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

diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
index 9a34e752d5c8..30e2ba2da525 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
@@ -11,6 +11,8 @@ overrides:
 tasks:
 - install:
     branch: nautilus
+    exclude_packages:
+      - ceph-daemon
 - install.upgrade:
     mon.a:
     mon.b:
diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
index f318d646492d..4db075e79c12 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
@@ -10,6 +10,8 @@ overrides:
 tasks:
 - install:
     branch: nautilus
+    exclude_packages:
+      - ceph-daemon
 - install.upgrade:
     mon.a:
     mon.b:
diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
index a060897280b5..3d2691a7b1dd 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
@@ -5,6 +5,8 @@ overrides:
 tasks:
 - install:
     branch: nautilus
+    exclude_packages:
+      - ceph-daemon
 - install.upgrade:
     mon.a:
     mon.b: