From 3ce379a689440ce084b2df79db59dd76e1b2db6c Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Tue, 7 Apr 2015 14:17:36 -0700
Subject: [PATCH] Reduced ammount of nodes from 4 to 3 Changed default
 'replica' to 2 Reduced osd to 2 per node Added logging

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 config_options/cephdeploy_conf.yaml           |  1 +
 .../rados/tasks/rados_api_tests.yaml          | 18 ++++++++----------
 .../ceph-deploy/rados/tasks/rados_python.yaml | 19 ++++++++-----------
 .../tasks/rados_workunit_loadgen_big.yaml     | 18 ++++++++----------
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/config_options/cephdeploy_conf.yaml b/config_options/cephdeploy_conf.yaml
index b640c8e195464..7f9f0b797d3bc 100644
--- a/config_options/cephdeploy_conf.yaml
+++ b/config_options/cephdeploy_conf.yaml
@@ -3,3 +3,4 @@ overrides:
       conf:
          global:
              mon pg warn min per osd: 2
+             osd pool default size: 2
diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
index 32baa730f73c0..13d05fa65f33a 100644
--- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
@@ -11,23 +11,21 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         client.0:
            - rados/test.sh
+- print: "**** done rados/test.sh"
diff --git a/suites/ceph-deploy/rados/tasks/rados_python.yaml b/suites/ceph-deploy/rados/tasks/rados_python.yaml
index 634ece2763320..6c31dd8ab9656 100644
--- a/suites/ceph-deploy/rados/tasks/rados_python.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_python.yaml
@@ -11,24 +11,21 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         client.0:
            - rados/test_python.sh
-
+- print: "**** done rados/test_python.sh"
diff --git a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
index 9f3140393b8b2..d45909cbfa2e7 100644
--- a/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_workunit_loadgen_big.yaml
@@ -11,24 +11,22 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         all:
            - rados/load-gen-big.sh
+- print: "**** done rados/load-gen-big.sh"
 
-- 
2.39.5