Reduced ammount of nodes from 4 to 3

Added logging
Changed replica "osd pool default size: 2"

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --cc suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
index ee35e1a56c87046b09e3949127ec9bc164babd2b,ee35e1a56c87046b09e3949127ec9bc164babd2b..549ad9e9d66b1f59e6a6f754440f710389ecc120
--- 1/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
--- 2/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
@@@ -11,25 -11,25 +11,24 @@@ 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"
  - ceph-fuse:
++- print: "**** done ceph-fuse"
  - workunit:
       clients:
          client.0:
             - suites/blogbench.sh
++- print: "**** done suites/blogbench.sh"
  exclude_arch: armv7l

diff --cc suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_dbench.yaml
index 58f7a5456aec01e2ddff8bcdff5ad75cba13b476,58f7a5456aec01e2ddff8bcdff5ad75cba13b476..e1746976c7ca074419906dc58756f2ccbd20707e
--- 1/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_dbench.yaml
--- 2/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_dbench.yaml
@@@ -11,25 -11,25 +11,24 @@@ roles
  - - mon.a
    - mds.0
    - osd.0
--  - osd.1
--  - osd.2
--- - mon.b
--  - osd.4
--  - osd.3
--  - 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"
  - ceph-fuse:
++- print: "**** done ceph-deploy"
  - workunit:
       clients:
          client.0:
             - suites/dbench.sh
++- print: "**** done suites/dbench.sh"
  exclude_arch: armv7l

diff --cc suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_fsstress.yaml
index b912ffedf7b1e07cc4224f97cd3b06236abbca4f,b912ffedf7b1e07cc4224f97cd3b06236abbca4f..3e2f9e989780df5f25c1cd11d9a3f4dd88d1bc6e
--- 1/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_fsstress.yaml
--- 2/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_fsstress.yaml
@@@ -11,25 -11,25 +11,24 @@@ 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"
  - ceph-fuse:
++- print: "**** done ceph-fuse"
  - workunit:
       clients:
          client.0:
             - suites/fsstress.sh
++- print: "**** done suites/fsstress.sh"
  exclude_arch: armv7l

diff --cc suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
index 1333358a8efae8e1ca5cb7edf5d3863b8162a1b3,1333358a8efae8e1ca5cb7edf5d3863b8162a1b3..6129b922ca5a86e93ae9e5bb451627351e9148ba
--- 1/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
--- 2/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_api_tests_old_format.yaml
@@@ -11,23 -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:
             - rbd/test_librbd.sh
++- print: "**** done rbd/test_librbd.sh"

diff --cc suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
index 27eb5299123c818dd6b1e6dc492266d2a5951eea,27eb5299123c818dd6b1e6dc492266d2a5951eea..c9a5d5098af717c2ec088af677a8a0cdf3c09597
--- 1/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
--- 2/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cli_tests.yaml
@@@ -11,23 -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:
             - rbd/run_cli_tests.sh
++- print: "**** done rbd/run_cli_tests.sh"

diff --cc suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
index 1abca13698c908906cdaf5f9d787d5068314e958,1abca13698c908906cdaf5f9d787d5068314e958..fdb20b8a6c7b66dd30732822c8cc39f2d903dfae
--- 1/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
--- 2/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_cls_test.yaml
@@@ -11,23 -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:
             - cls/test_cls_rbd.sh
++- print: "**** done cls/test_cls_rbd.sh"

diff --cc suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
index 9c663f53864226eb34143fe773c9135c22fb4361,9c663f53864226eb34143fe773c9135c22fb4361..89cf1acea4319a95e580b70dca7effad6dcfc49a
--- 1/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
--- 2/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
@@@ -11,23 -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:
             - rbd/test_librbd_python.sh
++- print: "**** done rbd/test_librbd_python.sh"

diff --cc suites/ceph-deploy/singleton/all/basic-test.yaml
index 14711d05856cbeb2d5db46d0494cb9b4db1dca7a,14711d05856cbeb2d5db46d0494cb9b4db1dca7a..a03db6f4dbd01cef6e45299808af93a08fd4196d
--- 1/suites/ceph-deploy/singleton/all/basic-test.yaml
--- 2/suites/ceph-deploy/singleton/all/basic-test.yaml
+++ b/suites/ceph-deploy/singleton/all/basic-test.yaml
@@@ -11,25 -11,25 +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:
             - suites/blogbench.sh
--
++- print: "**** done suites/blogbench.sh"