From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 13:34:44 +0000 (+0000)
Subject: qa/suites/rados/cephadm: deploy all monitoring components
X-Git-Tag: v15.1.1~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33785%2Fhead;p=ceph.git

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 ca92a8ff1881..387053022aef 100644
--- 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 230ff0fdab41..5c3e0593cbc9 120000
--- 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