From 910fc61fdc13598fdfceeaa7ead00ecf9fd52af6 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 3 Feb 2020 09:22:00 +0100 Subject: [PATCH] tests: remove legacy `osd_scenario` variable As of stable-4.0 most of these references aren't needed anymore. Signed-off-by: Guillaume Abrioux --- tests/functional/add-mgrs/container/group_vars/all | 1 - tests/functional/add-mgrs/group_vars/all | 1 - tests/functional/add-mons/container/group_vars/all | 1 - tests/functional/add-mons/group_vars/all | 1 - tests/functional/add-rbdmirrors/container/group_vars/all | 1 - tests/functional/add-rbdmirrors/group_vars/all | 1 - tests/functional/add-rgws/container/group_vars/all | 1 - tests/functional/add-rgws/group_vars/all | 1 - tests/functional/shrink_mds/group_vars/all | 1 - tests/functional/shrink_rbdmirror/group_vars/all | 1 - tests/functional/shrink_rgw/group_vars/all | 1 - 11 files changed, 11 deletions(-) diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all index 10fa7c9d7..554dbdf67 100644 --- a/tests/functional/add-mgrs/container/group_vars/all +++ b/tests/functional/add-mgrs/container/group_vars/all @@ -10,7 +10,6 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all index 46cc24fd7..e71a849a8 100644 --- a/tests/functional/add-mgrs/group_vars/all +++ b/tests/functional/add-mgrs/group_vars/all @@ -8,7 +8,6 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index 2c3d74115..62d73de51 100644 --- a/tests/functional/add-mons/container/group_vars/all +++ b/tests/functional/add-mons/container/group_vars/all @@ -10,7 +10,6 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all index 364a234bb..0f373035c 100644 --- a/tests/functional/add-mons/group_vars/all +++ b/tests/functional/add-mons/group_vars/all @@ -8,7 +8,6 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all index 905b0e89a..03b62992d 100644 --- a/tests/functional/add-rbdmirrors/container/group_vars/all +++ b/tests/functional/add-rbdmirrors/container/group_vars/all @@ -10,7 +10,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }} radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-rbdmirrors/group_vars/all b/tests/functional/add-rbdmirrors/group_vars/all index ee78be5ef..5e1b98daa 100644 --- a/tests/functional/add-rbdmirrors/group_vars/all +++ b/tests/functional/add-rbdmirrors/group_vars/all @@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }} radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all index 6c2050691..b7c9e1a43 100644 --- a/tests/functional/add-rgws/container/group_vars/all +++ b/tests/functional/add-rgws/container/group_vars/all @@ -10,7 +10,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }} radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/add-rgws/group_vars/all b/tests/functional/add-rgws/group_vars/all index 0171a8fff..878aadfa4 100644 --- a/tests/functional/add-rgws/group_vars/all +++ b/tests/functional/add-rgws/group_vars/all @@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }} radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: diff --git a/tests/functional/shrink_mds/group_vars/all b/tests/functional/shrink_mds/group_vars/all index fe12c83d4..56893f35d 100644 --- a/tests/functional/shrink_mds/group_vars/all +++ b/tests/functional/shrink_mds/group_vars/all @@ -7,7 +7,6 @@ monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true ceph_conf_overrides: global: diff --git a/tests/functional/shrink_rbdmirror/group_vars/all b/tests/functional/shrink_rbdmirror/group_vars/all index 45cccc7d3..60a9f5026 100644 --- a/tests/functional/shrink_rbdmirror/group_vars/all +++ b/tests/functional/shrink_rbdmirror/group_vars/all @@ -5,7 +5,6 @@ public_network: "192.168.85.0/24" cluster_network: "192.168.86.0/24" monitor_interface: eth1 osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true ceph_conf_overrides: global: diff --git a/tests/functional/shrink_rgw/group_vars/all b/tests/functional/shrink_rgw/group_vars/all index 9833f6774..10367bc2a 100644 --- a/tests/functional/shrink_rgw/group_vars/all +++ b/tests/functional/shrink_rgw/group_vars/all @@ -6,7 +6,6 @@ cluster_network: "192.168.90.0/24" monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" osd_objectstore: "bluestore" -osd_scenario: lvm copy_admin_key: true ceph_conf_overrides: global: