From fc0fa48e0dea6dfafc79565bad1689b750165526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 21 Feb 2018 15:26:30 +0100
Subject: [PATCH] test: add tests for creating crush tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now run tests on the newly created ceph_crush module. Now the CI will
create a specific hierarchy for the OSD.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 tests/functional/centos/7/cluster/group_vars/mons | 10 ++++++++++
 tests/functional/centos/7/cluster/hosts           |  2 +-
 tests/functional/centos/7/docker/group_vars/mons  | 10 ++++++++++
 tests/functional/centos/7/docker/hosts            |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/tests/functional/centos/7/cluster/group_vars/mons b/tests/functional/centos/7/cluster/group_vars/mons
index acb09490a..d4d1d4334 100644
--- a/tests/functional/centos/7/cluster/group_vars/mons
+++ b/tests/functional/centos/7/cluster/group_vars/mons
@@ -2,3 +2,13 @@
 cephfs_pools:
   - { name: "{{ cephfs_data }}", pgs: "8" }
   - { name: "{{ cephfs_metadata }}", pgs: "8" }
+
+create_crush_tree: True
+crush_rule_config: True
+crush_rule_hdd:
+  name: HDD
+  root: HDD
+  type: host
+  default: true
+crush_rules:
+  - "{{ crush_rule_hdd }}"
diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 257f98aa8..2d044caa8 100644
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -7,7 +7,7 @@ ceph-mon2 monitor_address=192.168.1.12
 ceph-mgr0
 
 [osds]
-ceph-osd0
+ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }"
 
 [mdss]
 ceph-mds0
diff --git a/tests/functional/centos/7/docker/group_vars/mons b/tests/functional/centos/7/docker/group_vars/mons
index acb09490a..d4d1d4334 100644
--- a/tests/functional/centos/7/docker/group_vars/mons
+++ b/tests/functional/centos/7/docker/group_vars/mons
@@ -2,3 +2,13 @@
 cephfs_pools:
   - { name: "{{ cephfs_data }}", pgs: "8" }
   - { name: "{{ cephfs_metadata }}", pgs: "8" }
+
+create_crush_tree: True
+crush_rule_config: True
+crush_rule_hdd:
+  name: HDD
+  root: HDD
+  type: host
+  default: true
+crush_rules:
+  - "{{ crush_rule_hdd }}"
diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
index dcb2c123c..8b42eeeac 100644
--- a/tests/functional/centos/7/docker/hosts
+++ b/tests/functional/centos/7/docker/hosts
@@ -7,7 +7,7 @@ mon2
 mgr0
 
 [osds]
-osd0
+osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 
 [mdss]
 mds0