From: Zack Cerza <zack@redhat.com>
Date: Wed, 21 Mar 2018 22:00:58 +0000 (-0600)
Subject: qa/suites/cephmetrics: Add new facets
X-Git-Tag: v13.1.0~408^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dd5e15a33d326663b833eb4d564cc8640f710765;p=ceph-ci.git

qa/suites/cephmetrics: Add new facets

For EPEL and containerized prometheus/grafana

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/qa/suites/cephmetrics/3-ceph-config/bluestore_with_dmcrypt.yaml b/qa/suites/cephmetrics/3-ceph-config/bluestore_with_dmcrypt.yaml
new file mode 100644
index 00000000000..16db8ab2704
--- /dev/null
+++ b/qa/suites/cephmetrics/3-ceph-config/bluestore_with_dmcrypt.yaml
@@ -0,0 +1,8 @@
+meta:
+- desc: "use bluestore + dmcrypt"
+
+overrides:
+   ceph_ansible:
+     vars:
+        osd_objectstore: bluestore
+        dmcrypt: True
diff --git a/qa/suites/cephmetrics/3-ceph-config/bluestore_without_dmcrypt.yaml b/qa/suites/cephmetrics/3-ceph-config/bluestore_without_dmcrypt.yaml
new file mode 100644
index 00000000000..fc879fc8e60
--- /dev/null
+++ b/qa/suites/cephmetrics/3-ceph-config/bluestore_without_dmcrypt.yaml
@@ -0,0 +1,8 @@
+meta:
+- desc: "use bluestore without dmcrypt"
+
+overrides:
+   ceph_ansible:
+     vars:
+        osd_objectstore: bluestore
+        dmcrypt: False
diff --git a/qa/suites/cephmetrics/3-ceph-config/dmcrypt_off.yaml b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_off.yaml
new file mode 100644
index 00000000000..4bbd1c7c5d1
--- /dev/null
+++ b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_off.yaml
@@ -0,0 +1,7 @@
+meta:
+- desc: "without dmcrypt"
+
+overrides:
+   ceph_ansible:
+     vars:
+        dmcrypt: False
diff --git a/qa/suites/cephmetrics/3-ceph-config/dmcrypt_on.yaml b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_on.yaml
new file mode 100644
index 00000000000..519ad1d79a1
--- /dev/null
+++ b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_on.yaml
@@ -0,0 +1,7 @@
+meta:
+- desc: "with dmcrypt"
+
+overrides:
+   ceph_ansible:
+     vars:
+        dmcrypt: True
diff --git a/qa/suites/cephmetrics/3-config/bluestore_with_dmcrypt.yaml b/qa/suites/cephmetrics/3-config/bluestore_with_dmcrypt.yaml
deleted file mode 100644
index 16db8ab2704..00000000000
--- a/qa/suites/cephmetrics/3-config/bluestore_with_dmcrypt.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-meta:
-- desc: "use bluestore + dmcrypt"
-
-overrides:
-   ceph_ansible:
-     vars:
-        osd_objectstore: bluestore
-        dmcrypt: True
diff --git a/qa/suites/cephmetrics/3-config/bluestore_without_dmcrypt.yaml b/qa/suites/cephmetrics/3-config/bluestore_without_dmcrypt.yaml
deleted file mode 100644
index fc879fc8e60..00000000000
--- a/qa/suites/cephmetrics/3-config/bluestore_without_dmcrypt.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-meta:
-- desc: "use bluestore without dmcrypt"
-
-overrides:
-   ceph_ansible:
-     vars:
-        osd_objectstore: bluestore
-        dmcrypt: False
diff --git a/qa/suites/cephmetrics/3-config/dmcrypt_off.yaml b/qa/suites/cephmetrics/3-config/dmcrypt_off.yaml
deleted file mode 100644
index 4bbd1c7c5d1..00000000000
--- a/qa/suites/cephmetrics/3-config/dmcrypt_off.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-meta:
-- desc: "without dmcrypt"
-
-overrides:
-   ceph_ansible:
-     vars:
-        dmcrypt: False
diff --git a/qa/suites/cephmetrics/3-config/dmcrypt_on.yaml b/qa/suites/cephmetrics/3-config/dmcrypt_on.yaml
deleted file mode 100644
index 519ad1d79a1..00000000000
--- a/qa/suites/cephmetrics/3-config/dmcrypt_on.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-meta:
-- desc: "with dmcrypt"
-
-overrides:
-   ceph_ansible:
-     vars:
-        dmcrypt: True
diff --git a/qa/suites/cephmetrics/4-epel/no_epel.yaml b/qa/suites/cephmetrics/4-epel/no_epel.yaml
new file mode 100644
index 00000000000..1538fd7f8a4
--- /dev/null
+++ b/qa/suites/cephmetrics/4-epel/no_epel.yaml
@@ -0,0 +1,7 @@
+meta:
+  - desc: "Without EPEL"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        use_epel: false
diff --git a/qa/suites/cephmetrics/4-epel/use_epel.yaml b/qa/suites/cephmetrics/4-epel/use_epel.yaml
new file mode 100644
index 00000000000..d496a43ea2f
--- /dev/null
+++ b/qa/suites/cephmetrics/4-epel/use_epel.yaml
@@ -0,0 +1,7 @@
+meta:
+  - desc: "Using EPEL"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        use_epel: true
diff --git a/qa/suites/cephmetrics/4-tasks/cephmetrics.yaml b/qa/suites/cephmetrics/4-tasks/cephmetrics.yaml
deleted file mode 100644
index 15f90394c29..00000000000
--- a/qa/suites/cephmetrics/4-tasks/cephmetrics.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-meta:
-- desc: "Deploy cephmetrics and run integration tests"
-tasks:
-- cephmetrics:
diff --git a/qa/suites/cephmetrics/5-containers/containerized.yaml b/qa/suites/cephmetrics/5-containers/containerized.yaml
new file mode 100644
index 00000000000..686de08a2b8
--- /dev/null
+++ b/qa/suites/cephmetrics/5-containers/containerized.yaml
@@ -0,0 +1,10 @@
+meta:
+  - desc: "Containerized prometheus and grafana"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        prometheus:
+          containerized: true
+        grafana:
+          containerized: true
diff --git a/qa/suites/cephmetrics/5-containers/no_containers.yaml b/qa/suites/cephmetrics/5-containers/no_containers.yaml
new file mode 100644
index 00000000000..29c690939a6
--- /dev/null
+++ b/qa/suites/cephmetrics/5-containers/no_containers.yaml
@@ -0,0 +1,10 @@
+meta:
+  - desc: "Packaged prometheus and grafana"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        prometheus:
+          containerized: false
+        grafana:
+          containerized: false
diff --git a/qa/suites/cephmetrics/6-tasks/cephmetrics.yaml b/qa/suites/cephmetrics/6-tasks/cephmetrics.yaml
new file mode 100644
index 00000000000..15f90394c29
--- /dev/null
+++ b/qa/suites/cephmetrics/6-tasks/cephmetrics.yaml
@@ -0,0 +1,4 @@
+meta:
+- desc: "Deploy cephmetrics and run integration tests"
+tasks:
+- cephmetrics: