qa/suites/rados/cephadm: deploy all monitoring components

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

diff --git a/qa/suites/rados/cephadm/smoke/fixed-2.yaml b/qa/suites/rados/cephadm/smoke/fixed-2.yaml
index ca92a8ff1881008331b6283ff0ff363fd72c921b..387053022aef33f70fd89cea6569a84fcd7734ec 100644 (file)
--- a/qa/suites/rados/cephadm/smoke/fixed-2.yaml
+++ b/qa/suites/rados/cephadm/smoke/fixed-2.yaml
@@ -1,6 +1,24 @@
 roles:
-- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0]
-- [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1, prometheus.a]
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
 openstack:
 - volumes: # attached to each instance
     count: 4

diff --git a/qa/suites/rados/cephadm/with-work/fixed-2.yaml b/qa/suites/rados/cephadm/with-work/fixed-2.yaml
index 230ff0fdab4126f8b7aed4317541c0ce278ffed7..5c3e0593cbc967a57d9b0aaf3998e1f3af29b26c 120000 (symlink)
--- a/qa/suites/rados/cephadm/with-work/fixed-2.yaml
+++ b/qa/suites/rados/cephadm/with-work/fixed-2.yaml
@@ -1 +1 @@
-.qa/clusters/fixed-2.yaml
\ No newline at end of file
+../smoke/fixed-2.yaml
\ No newline at end of file