qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 16b30f2858aa8edb42cff79c4d40b40ec5ae72cc)

diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
index f6c5c369af440210f2a617189cf5a2bd786c4bb0..7f57076dbe2b50ba8c0731d0cad7ad3deb36f8e2 100644 (file)
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
@@ -4,4 +4,5 @@ tasks:
       - ceph osd pool create foo
       - rbd pool init foo
       - ceph orch apply iscsi foo u p
-      - sleep 120
+- cephadm.wait_for_service:
+    service: iscsi.foo

diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
index 26c656c46778295a687858a5940d95b3144f9fd5..681e1e04ac78c6c98bd9049724a8d0cb343f71b8 100644 (file)
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
@@ -3,4 +3,7 @@ tasks:
     host.a:
       - ceph orch apply rbd-mirror "--placement=*"
       - ceph orch apply cephfs-mirror "--placement=*"
-      - sleep 120
+- cephadm.wait_for_service:
+    service: rbd-mirror
+- cephadm.wait_for_service:
+    service: cephfs-mirror

diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
index 161b15c770cf06b34826ad62b77d84b8f5e02be8..cb2c6f4b6b8a2c1a357999810c432d389c45d5bb 100644 (file)
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
@@ -8,5 +8,5 @@ tasks:
           host_pattern: "*"
         spec:
           rgw_frontend_port: 8000
-- sleep:
-    interval: 60
+- cephadm.wait_for_service:
+    service: rgw.foo