qa: add ceph-daemon

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

diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml
index b19e5b015458fcb36bdcd0b19eaed1481e97c4c6..c8a099098fd896963a68e331f9379f9a670c744e 100644 (file)
--- a/qa/packages/packages.yaml
+++ b/qa/packages/packages.yaml
@@ -2,6 +2,7 @@
 ceph:
   deb:
   - ceph
+  - ceph-daemon
   - ceph-mds
   - ceph-mgr
   - ceph-common
@@ -34,6 +35,7 @@ ceph:
   - ceph-radosgw
   - ceph-test
   - ceph
+  - ceph-daemon
   - ceph-mgr
   - ceph-mgr-dashboard
   - ceph-mgr-diskprediction-cloud

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
index f9323cc1fb6dac441eb287d59978a35d1080cf46..c285e4604c63a4dfad13d0d005a0d7faf1b6461b 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
@@ -11,6 +11,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
index f9323cc1fb6dac441eb287d59978a35d1080cf46..c285e4604c63a4dfad13d0d005a0d7faf1b6461b 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
@@ -11,6 +11,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index 093115e7775f5947e279796a1e568e5028529cdf..804a46e77322e9fb73af009c13e8b767a3ed4ded 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -21,6 +21,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
       - ceph-mgr
       - libcephfs2
       - libcephfs-devel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
index c32e1daa0cc0be4e81da95be1c1025f87e6fb627..34935d967bf9a9c88f604aa61d044a1f6d906a34 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
@@ -18,6 +18,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
       - ceph-mgr
       - libcephfs2
       - libcephfs-devel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index f48bd8b256d2536a4ef0475bb5c974acdcb8d982..a61c87d258b911aa37994f91842766b58dbd28d0 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -17,6 +17,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
       - ceph-mgr
       - libcephfs2
       - libcephfs-devel

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
index 73490ee68de290f2beda3f1b36629d22f996e1d8..9784952cabb2c8fdd6029037f7fd3c0bc57865b7 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
@@ -18,6 +18,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index 2f1234205ccb565e7a3c1a605ec3b837cc67753a..8f9d34d0b4565cc49177b1b37a07b1d4ced50215 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -17,6 +17,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
index eadb2c6613d6e20ad0bf6df7abdcf010d3a6f37c..34786ef784fac64db03dd77053564f90bd575748 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
@@ -18,6 +18,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
index f2b70eb3d22c029bdd04c6dc3b60e3fbd4fb861d..bdb6b62185576e71d044e98ed5c38163f3255786 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
@@ -18,6 +18,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
index 8c715e90f055cb96c61b05910deb3dd7b9db51d2..02ac0468e23e457aeffed6264d43a6ea4daf00e7 100644 (file)
--- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
@@ -16,6 +16,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done install mimic"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index 8ea78c7aa7f1513d3dffbfd2279c3e44415b1bd2..e4ca466baeb0c49bd645fec5ef9183f67b3e9b92 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -13,6 +13,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
index 19af4eff7671a86d1dece30afcabbb8b756e567a..6c4fe67e8fe682cb0af6aca96e66308131cb94e3 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
@@ -10,6 +10,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done install mimic"
 - ceph:

diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
index 0b7fd6796626090276d138629098ccd11ca917c1..e56c437e0a1c12a5c803aa86d8a8f99f3e397139 100644 (file)
--- a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
@@ -16,6 +16,7 @@ tasks:
       - ceph-mgr-diskprediction-cloud
       - ceph-mgr-rook
       - ceph-mgr-ssh
+      - ceph-daemon
     extra_packages: ['librados2']
 - print: "**** done install nautilus"
 - ceph: