test: remove osd_crush_location from shrink scenarios

This is not needed since this is already covered by docker_cluster and
centos_cluster scenarios.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/tests/functional/centos/7/shrink_osd/group_vars/mons b/tests/functional/centos/7/shrink_osd/group_vars/mons
deleted file mode 100644 (file)
index 4b88173..0000000
--- a/tests/functional/centos/7/shrink_osd/group_vars/mons
+++ /dev/null
@@ -1,10 +0,0 @@
----
-create_crush_tree: True
-crush_rule_config: True
-crush_rule_hdd:
-  name: HDD
-  root: HDD
-  type: host
-  default: true
-crush_rules:
-  - "{{ crush_rule_hdd }}"
\ No newline at end of file

diff --git a/tests/functional/centos/7/shrink_osd/hosts b/tests/functional/centos/7/shrink_osd/hosts
index 9f49394de1f82ca36fe4edccc1b25fb2a634525a..02b377cf4745e3e789ae0d1370422bf8d0718c5f 100644 (file)
--- a/tests/functional/centos/7/shrink_osd/hosts
+++ b/tests/functional/centos/7/shrink_osd/hosts
@@ -5,6 +5,6 @@ ceph-mon0 monitor_address=192.168.1.10
 ceph-mon0
 
 [osds]
-ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }"
-ceph-osd1 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd1' }"
-ceph-osd2 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd2' }"
+ceph-osd0
+ceph-osd1
+ceph-osd2

diff --git a/tests/functional/centos/7/shrink_osd_container/group_vars/mons b/tests/functional/centos/7/shrink_osd_container/group_vars/mons
deleted file mode 100644 (file)
index 4b54059..0000000
--- a/tests/functional/centos/7/shrink_osd_container/group_vars/mons
+++ /dev/null
@@ -1,10 +0,0 @@
----
-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/shrink_osd_container/hosts b/tests/functional/centos/7/shrink_osd_container/hosts
index 8f48f40a44acfe20b12fe459e1c7435d7ca5c3ae..6c1829b31effcd66aba3149bc5297007fb9de352 100644 (file)
--- a/tests/functional/centos/7/shrink_osd_container/hosts
+++ b/tests/functional/centos/7/shrink_osd_container/hosts
@@ -5,6 +5,6 @@ mon0
 mon0
 
 [osds]
-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
-osd1 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd1' }"
-osd2 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd2' }"
+osd0
+osd1
+osd2