From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Mar 2021 21:54:28 +0000 (-0500)
Subject: qa/suites/rados/cephadm/smoke-roleless: add rgw test on many ports
X-Git-Tag: v17.1.0~2601^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e335b682b3f46032daacf189defe6b7b548fe8bd;p=ceph.git

qa/suites/rados/cephadm/smoke-roleless: add rgw test on many ports

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml b/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml
new file mode 100644
index 000000000000..2ca0d0e00868
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml
@@ -0,0 +1,32 @@
+tasks:
+- cephadm:
+    roleless: true
+- cephadm.shell:
+    host.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls
+roles:
+- - host.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+- - host.b
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/% b/qa/suites/rados/cephadm/smoke-roleless/2-services/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/basic.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/basic.yaml
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
new file mode 100644
index 000000000000..fab3551c8531
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph orch apply rgw foo --port=8000 "--placement=count-per-host:4 *"
+      - sleep 60
diff --git a/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml b/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml
new file mode 100644
index 000000000000..02f5b289c1ad
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml
@@ -0,0 +1,8 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls
diff --git a/qa/suites/rados/cephadm/smoke-roleless/start.yaml b/qa/suites/rados/cephadm/smoke-roleless/start.yaml
deleted file mode 100644
index 2ca0d0e00868..000000000000
--- a/qa/suites/rados/cephadm/smoke-roleless/start.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-tasks:
-- cephadm:
-    roleless: true
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls
-roles:
-- - host.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-- - host.b
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.1
-openstack:
-- volumes: # attached to each instance
-    count: 4
-    size: 10 # GB
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true