From: Sébastien Han Date: Tue, 7 Aug 2018 11:36:44 +0000 (+0200) Subject: test: remove osd_crush_location from shrink scenarios X-Git-Tag: v3.2.0beta2~84 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=50be3fd9e8c0944cdddbd88bc8287e65765b0c63;p=ceph-ansible.git 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 --- 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 index 4b8817342..000000000 --- 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 9f49394de..02b377cf4 100644 --- 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 index 4b5405947..000000000 --- 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 8f48f40a4..6c1829b31 100644 --- 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