From: Sébastien Han <seb@redhat.com>
Date: Tue, 17 Oct 2017 13:12:56 +0000 (+0200)
Subject: ceph-ansible-prs: simply osd scenarios
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F887%2Fhead;p=ceph-build.git

ceph-ansible-prs: simply osd scenarios

* 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>
---

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 7adbe46a4..ab700a10a 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 ad6916f12..92d542e74 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}'