tests: remove legacy `osd_scenario` variable

As of stable-4.0 most of these references aren't needed anymore.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/5037/head
Guillaume Abrioux 2020-02-03 09:22:00 +01:00
parent 298ba0bf03
commit 910fc61fdc
11 changed files with 0 additions and 11 deletions

View File

@ -10,7 +10,6 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -8,7 +8,6 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -10,7 +10,6 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -8,7 +8,6 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -10,7 +10,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -10,7 +10,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:

View File

@ -7,7 +7,6 @@ monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
ceph_conf_overrides: ceph_conf_overrides:
global: global:

View File

@ -5,7 +5,6 @@ public_network: "192.168.85.0/24"
cluster_network: "192.168.86.0/24" cluster_network: "192.168.86.0/24"
monitor_interface: eth1 monitor_interface: eth1
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
ceph_conf_overrides: ceph_conf_overrides:
global: global:

View File

@ -6,7 +6,6 @@ cluster_network: "192.168.90.0/24"
monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
osd_objectstore: "bluestore" osd_objectstore: "bluestore"
osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
ceph_conf_overrides: ceph_conf_overrides:
global: global: