From: Andrew Schoen Date: Mon, 5 Dec 2016 22:27:19 +0000 (-0600) Subject: tests: with testinfra we don't need scenario.py files anymore X-Git-Tag: v2.1.0~26^2~19 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=73705933c9b5df01715a9c6dfb24a6e4de8fabfa;p=ceph-ansible.git tests: with testinfra we don't need scenario.py files anymore Signed-off-by: Andrew Schoen --- diff --git a/tests/functional/centos/7/cluster/scenario.py b/tests/functional/centos/7/cluster/scenario.py deleted file mode 100644 index 658444f03..000000000 --- a/tests/functional/centos/7/cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph', - 'subnet': '192.168.1', -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -} diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py b/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py deleted file mode 100644 index 44d530091..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py +++ /dev/null @@ -1,19 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [], - }, -} diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py b/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py deleted file mode 100644 index 44d530091..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py +++ /dev/null @@ -1,19 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [], - }, -} diff --git a/tests/functional/centos/7/docker-cluster/scenario.py b/tests/functional/centos/7/docker-cluster/scenario.py deleted file mode 100644 index 31b12adf6..000000000 --- a/tests/functional/centos/7/docker-cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph', - 'subnet': '192.168.15', -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -} diff --git a/tests/functional/centos/7/journal-collocation/scenario.py b/tests/functional/centos/7/journal-collocation/scenario.py deleted file mode 100644 index e51221591..000000000 --- a/tests/functional/centos/7/journal-collocation/scenario.py +++ /dev/null @@ -1,20 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': ['collocated_journals'], - 'devices': ['/dev/sda', '/dev/sdb'], - }, -} diff --git a/tests/functional/ubuntu/16.04/cluster/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py deleted file mode 100644 index 61e80611a..000000000 --- a/tests/functional/ubuntu/16.04/cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph', - 'subnet': '192.168.5', -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -}