test: add cluster name support test scenario

We need to test the cluster name support in this CI as well. This
commit might be prone to debate because it tests 2 things in a single
scenario. We first test our ability to deploy a cluster AND the cluster
name support. However it's easier to do it this way and will reduce the
amount of time for testingg. If we don't do this we will have a
duplicate those 2 existing tests into new ones 'only' to test the
cluster name support.

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

diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
index 2ac2dbd5e7eec37bdd578d8364f70c4278b11ed7..dc312236bb4e5e0e32acd5348cbc7e2ee352a1aa 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
 ceph_stable: True
+cluster: test
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
 journal_size: 100

diff --git a/tests/functional/centos/7/cluster/scenario.py b/tests/functional/centos/7/cluster/scenario.py
new file mode 100644 (file)
index 0000000..601f8f0
--- /dev/null
+++ b/tests/functional/centos/7/cluster/scenario.py
@@ -0,0 +1,36 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test',
+    '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/group_vars/all b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
index 2357d9ee5d01e5cc9d68563c0982b7321c54ac98..b8f77bd29d5c34eeb4fe071d2f6f1f62988f236d 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
+++ b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
 ceph_stable: True
+cluster: test
 public_network: "192.168.11.0/24"
 cluster_network: "192.168.12.0/24"
 journal_size: 100

diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py b/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py
new file mode 100644 (file)
index 0000000..1655472
--- /dev/null
+++ b/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py
@@ -0,0 +1,19 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test'
+}
+
+# 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/group_vars/all b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
index 7ff9feb6604025a887c5bfebae316b22f6053a39..53fce49a838fd0f303dcf072020305203317e859 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
+++ b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
 ceph_stable: True
+cluster: test
 public_network: "192.168.13.0/24"
 cluster_network: "192.168.14.0/24"
 journal_size: 100

diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py b/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py
new file mode 100644 (file)
index 0000000..1655472
--- /dev/null
+++ b/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py
@@ -0,0 +1,19 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test'
+}
+
+# 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/group_vars/all b/tests/functional/centos/7/docker-cluster/group_vars/all
index 5e476c2c6122a61ab22c4551b6157e5df3e57b80..87c6e1e7b7d33450aad1294a09efe1f992a3b5e8 100644 (file)
--- a/tests/functional/centos/7/docker-cluster/group_vars/all
+++ b/tests/functional/centos/7/docker-cluster/group_vars/all
@@ -8,6 +8,7 @@ mon_containerized_deployment: True
 osd_containerized_deployment: True
 mds_containerized_deployment: True
 rgw_containerized_deployment: True
+cluster: test
 ceph_mon_docker_interface: eth1
 ceph_mon_docker_subnet: "192.168.15.0/24"
 journal_size: 100

diff --git a/tests/functional/centos/7/docker-cluster/scenario.py b/tests/functional/centos/7/docker-cluster/scenario.py
new file mode 100644 (file)
index 0000000..160a5ec
--- /dev/null
+++ b/tests/functional/centos/7/docker-cluster/scenario.py
@@ -0,0 +1,36 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test',
+    '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/group_vars/all b/tests/functional/centos/7/journal-collocation/group_vars/all
index 95e343693ad67d9b3be141168e2cf17c5e306218..81857e670f85b600d74a05b276abc72ea9fa8af1 100644 (file)
--- a/tests/functional/centos/7/journal-collocation/group_vars/all
+++ b/tests/functional/centos/7/journal-collocation/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
 ceph_stable: True
+cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
 journal_size: 100

diff --git a/tests/functional/centos/7/journal-collocation/scenario.py b/tests/functional/centos/7/journal-collocation/scenario.py
new file mode 100644 (file)
index 0000000..1068f44
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/scenario.py
@@ -0,0 +1,20 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test'
+}
+
+# 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/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index 9cb9f11ee0e9e09caf73a2d0c0c25b241b96741c..d9f58f30ee5fa85cd9bc217cf63733e84c9269cb 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
 ceph_stable: True
+cluster: test
 public_network: "192.168.5.0/24"
 cluster_network: "192.168.6.0/24"
 journal_size: 100

diff --git a/tests/functional/ubuntu/16.04/cluster/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py
new file mode 100644 (file)
index 0000000..38a71c0
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/scenario.py
@@ -0,0 +1,36 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'test',
+    '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': []
+    },
+}

diff --git a/tests/scenarios/example.py b/tests/scenarios/example.py
index 7be1c2b55b7df1009f916c3a2b339afecc2626de..8b69adf22c75f52864af97a0df3e811e7e191421 100644 (file)
--- a/tests/scenarios/example.py
+++ b/tests/scenarios/example.py
@@ -6,7 +6,7 @@
 # Basic information about ceph and its configuration
 ceph = {
     'releases': ['jewel', 'infernalis'],
-    'cluster_name': 'ceph'
+    'cluster_name': 'test'
 }
 
 # remote nodes to test, with anything specific to them that might be useful for