From dd5e15a33d326663b833eb4d564cc8640f710765 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Wed, 21 Mar 2018 16:00:58 -0600
Subject: [PATCH] qa/suites/cephmetrics: Add new facets

For EPEL and containerized prometheus/grafana

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 .../bluestore_with_dmcrypt.yaml                        |  0
 .../bluestore_without_dmcrypt.yaml                     |  0
 .../{3-config => 3-ceph-config}/dmcrypt_off.yaml       |  0
 .../{3-config => 3-ceph-config}/dmcrypt_on.yaml        |  0
 qa/suites/cephmetrics/4-epel/no_epel.yaml              |  7 +++++++
 qa/suites/cephmetrics/4-epel/use_epel.yaml             |  7 +++++++
 qa/suites/cephmetrics/5-containers/containerized.yaml  | 10 ++++++++++
 qa/suites/cephmetrics/5-containers/no_containers.yaml  | 10 ++++++++++
 .../cephmetrics/{4-tasks => 6-tasks}/cephmetrics.yaml  |  0
 9 files changed, 34 insertions(+)
 rename qa/suites/cephmetrics/{3-config => 3-ceph-config}/bluestore_with_dmcrypt.yaml (100%)
 rename qa/suites/cephmetrics/{3-config => 3-ceph-config}/bluestore_without_dmcrypt.yaml (100%)
 rename qa/suites/cephmetrics/{3-config => 3-ceph-config}/dmcrypt_off.yaml (100%)
 rename qa/suites/cephmetrics/{3-config => 3-ceph-config}/dmcrypt_on.yaml (100%)
 create mode 100644 qa/suites/cephmetrics/4-epel/no_epel.yaml
 create mode 100644 qa/suites/cephmetrics/4-epel/use_epel.yaml
 create mode 100644 qa/suites/cephmetrics/5-containers/containerized.yaml
 create mode 100644 qa/suites/cephmetrics/5-containers/no_containers.yaml
 rename qa/suites/cephmetrics/{4-tasks => 6-tasks}/cephmetrics.yaml (100%)

diff --git a/qa/suites/cephmetrics/3-config/bluestore_with_dmcrypt.yaml b/qa/suites/cephmetrics/3-ceph-config/bluestore_with_dmcrypt.yaml
similarity index 100%
rename from qa/suites/cephmetrics/3-config/bluestore_with_dmcrypt.yaml
rename to qa/suites/cephmetrics/3-ceph-config/bluestore_with_dmcrypt.yaml
diff --git a/qa/suites/cephmetrics/3-config/bluestore_without_dmcrypt.yaml b/qa/suites/cephmetrics/3-ceph-config/bluestore_without_dmcrypt.yaml
similarity index 100%
rename from qa/suites/cephmetrics/3-config/bluestore_without_dmcrypt.yaml
rename to qa/suites/cephmetrics/3-ceph-config/bluestore_without_dmcrypt.yaml
diff --git a/qa/suites/cephmetrics/3-config/dmcrypt_off.yaml b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_off.yaml
similarity index 100%
rename from qa/suites/cephmetrics/3-config/dmcrypt_off.yaml
rename to qa/suites/cephmetrics/3-ceph-config/dmcrypt_off.yaml
diff --git a/qa/suites/cephmetrics/3-config/dmcrypt_on.yaml b/qa/suites/cephmetrics/3-ceph-config/dmcrypt_on.yaml
similarity index 100%
rename from qa/suites/cephmetrics/3-config/dmcrypt_on.yaml
rename to qa/suites/cephmetrics/3-ceph-config/dmcrypt_on.yaml
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/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/4-tasks/cephmetrics.yaml b/qa/suites/cephmetrics/6-tasks/cephmetrics.yaml
similarity index 100%
rename from qa/suites/cephmetrics/4-tasks/cephmetrics.yaml
rename to qa/suites/cephmetrics/6-tasks/cephmetrics.yaml
-- 
2.39.5