From 4e5798cbe4e09d31a2076cc330f95cc7210198ac Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Tue, 17 Oct 2017 15:12:56 +0200
Subject: [PATCH] ceph-ansible-prs: simply osd scenarios
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* introduces new osd scenarios to reduce amount of osds
* do not run update jobs by default

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 .../config/definitions/ceph-ansible-prs.yml   | 25 ++++++-------------
 .../config/definitions/ceph-docker-prs.yml    |  5 ++--
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 7adbe46a..ab700a10 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -10,7 +10,7 @@
       - centos7_cluster
       - xenial_cluster
       - docker_cluster
-      - update_cluster
+      - docker_cluster_collocation
     jobs:
         - 'ceph-ansible-prs-auto'
 
@@ -25,9 +25,10 @@
       - ansible2.3
     scenario:
       - purge_cluster
+      - purge_docker_cluster
+      - update_cluster
       - update_docker_cluster
       - switch_to_containers
-      - purge_docker_cluster
     jobs:
         - 'ceph-ansible-prs-trigger'
 
@@ -41,22 +42,10 @@
     ansible_version:
       - ansible2.3
     scenario:
-      - journal_collocation
-      - journal_collocation_auto
-      - journal_collocation_auto_dmcrypt
-      - dmcrypt_journal
-      - dmcrypt_journal_collocation
-      - docker_cluster_collocation
-      - docker_dedicated_journal
-      - docker_dmcrypt_journal_collocation
-      - purge_dmcrypt
-      - update_dmcrypt
-      - bluestore_cluster
-      - bluestore_journal_collocation
-      - bluestore_dmcrypt_journal
-      - bluestore_dmcrypt_journal_collocation
-      - bluestore_docker_dedicated_journal
-      - bluestore_docker_dmcrypt_journal_collocation
+      - bluestore_osds_non_container
+      - bluestore_osds_container
+      - filestore_osds_non_container
+      - filestore_osds_container
       - shrink_mon
       - shrink_mon_container
       - shrink_osd
diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
index ad6916f1..92d542e7 100644
--- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
+++ b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
@@ -8,8 +8,9 @@
       - luminous
     test:
       - cluster
-      - dedicated_journal
-      - dmcrypt_journal_collocation
+      - filestore_osds_container
+      - bluestore_osds_container
+      - docker_cluster_collocation
     jobs:
         - 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
 
-- 
2.39.5