From c7d0fbbd198a56630bd0acf81a5d5ebe7ab6af61 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 9 Apr 2019 12:20:35 -0400
Subject: [PATCH] tests: Add debug to ceph-override.json

It's usefull to have logs in debug mode enabled in order to have
more information for developpers.
Also reindent to json file.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit d25af1b872628607e37741c760aa31b88229f3da)
---
 .../functional/all_daemons/ceph-override.json | 41 +++++++++++--------
 tox.ini                                       |  2 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/tests/functional/all_daemons/ceph-override.json b/tests/functional/all_daemons/ceph-override.json
index cce7e62e8..e7d6137a6 100644
--- a/tests/functional/all_daemons/ceph-override.json
+++ b/tests/functional/all_daemons/ceph-override.json
@@ -1,21 +1,26 @@
 {
-	"ceph_conf_overrides": {
-		"global": {
-			"osd_pool_default_pg_num": 12,
-			"osd_pool_default_size": 1
-		}
-	},
-	"cephfs_pools": [
-		{
-		  "name": "cephfs_metadata",
-		  "pgs": 8,
-		  "size": 1
-		},
-		{
-		  "name": "cephfs_data",
-		  "pgs": 8,
-		  "size": 1
-		}
-	],
+  "ceph_conf_overrides": {
+    "global": {
+      "osd_pool_default_pg_num": 12,
+      "osd_pool_default_size": 1,
+      "debug_ms": 20
+    },
+    "osd": {
+      "debug_bluefs": 20,
+      "debug_bluestore": 20
+    }
+  },
+  "cephfs_pools": [
+    {
+      "name": "cephfs_metadata",
+      "pgs": 8,
+      "size": 1
+    },
+    {
+      "name": "cephfs_data",
+      "pgs": 8,
+      "size": 1
+    }
+  ],
   "ceph_mon_docker_memory_limit": "2g"
 }
diff --git a/tox.ini b/tox.ini
index 09932552e..72fbe19f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
 
   # set up the cluster again
-  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
+  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
       ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
-- 
2.39.5