tests: move cephfs_pools variable

let's move this variable in group_vars/all.yml in all testing scenarios
accordingly to this commit 1f15a81c480f60bc82bfc3a1aec3fe136e6d3bc4 so
we keep consistency between the playbook and the tests.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a10e73d78d07179ff20ea7cabc2f2ccd1b1b967f)
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 e33f448afb6d8ce4e7e915c563b44ac9ebaf8c4e..4a6128afdc6c887eb18a4e99da65884a08313e70 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -39,4 +39,7 @@ openstack_cinder_pool:
   expected_num_objects: ""
 openstack_pools:
   - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
\ No newline at end of file
+  - "{{ openstack_cinder_pool }}"
+cephfs_pools:
+- { name: "{{ cephfs_data }}", pgs: "8" }
+- { name: "{{ cephfs_metadata }}", pgs: "8" }
\ No newline at end of file

diff --git a/tests/functional/centos/7/cluster/group_vars/mons b/tests/functional/centos/7/cluster/group_vars/mons
index fb7a9268b2a3dd78cb3ee55affe8aa307b7b4ad4..4b88173422b200e7d9686c990b20c8843b129485 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/mons
+++ b/tests/functional/centos/7/cluster/group_vars/mons
@@ -1,8 +1,4 @@
 ---
-cephfs_pools:
-  - { name: "{{ cephfs_data }}", pgs: "8" }
-  - { name: "{{ cephfs_metadata }}", pgs: "8" }
-
 create_crush_tree: True
 crush_rule_config: True
 crush_rule_hdd:

diff --git a/tests/functional/centos/7/docker-collocation/group_vars/all b/tests/functional/centos/7/docker-collocation/group_vars/all
index 7ae0a37c9f6ae7203baae062c52a71b14ced741d..be498905b9e1cfac68e3e76253f0d9cc571a8a7a 100644 (file)
--- a/tests/functional/centos/7/docker-collocation/group_vars/all
+++ b/tests/functional/centos/7/docker-collocation/group_vars/all
@@ -22,3 +22,6 @@ ceph_conf_overrides:
 devices:
   - /dev/sda
   - /dev/sdb
+cephfs_pools:
+  - { name: "{{ cephfs_data }}", pgs: "8" }
+  - { name: "{{ cephfs_metadata }}", pgs: "8" }
\ No newline at end of file

diff --git a/tests/functional/centos/7/docker-collocation/group_vars/mons b/tests/functional/centos/7/docker-collocation/group_vars/mons
deleted file mode 100644 (file)
index acb0949..0000000
--- a/tests/functional/centos/7/docker-collocation/group_vars/mons
+++ /dev/null
@@ -1,4 +0,0 @@
----
-cephfs_pools:
-  - { name: "{{ cephfs_data }}", pgs: "8" }
-  - { name: "{{ cephfs_metadata }}", pgs: "8" }

diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all
index fb2804976b5b86c338f92ebf6c4ddba8f38c7c97..680f6ce656a7a04ab5bac9d88a0fa3301735147d 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/all
+++ b/tests/functional/centos/7/docker/group_vars/all
@@ -41,3 +41,6 @@ openstack_cinder_pool:
 openstack_pools:
   - "{{ openstack_glance_pool }}"
   - "{{ openstack_cinder_pool }}"
+cephfs_pools:
+  - { name: "{{ cephfs_data }}", pgs: "8" }
+  - { name: "{{ cephfs_metadata }}", pgs: "8" }
\ No newline at end of file

diff --git a/tests/functional/centos/7/docker/group_vars/mons b/tests/functional/centos/7/docker/group_vars/mons
index d4d1d4334fb4fbea6b8155c44c5f2948b7176681..4b54059472a3fed8055b4efdcb5135e55a052993 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/mons
+++ b/tests/functional/centos/7/docker/group_vars/mons
@@ -1,8 +1,4 @@
 ---
-cephfs_pools:
-  - { name: "{{ cephfs_data }}", pgs: "8" }
-  - { name: "{{ cephfs_metadata }}", pgs: "8" }
-
 create_crush_tree: True
 crush_rule_config: True
 crush_rule_hdd:

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index f55fcdbcef6e88f94b3cbfe49c8393d2ed429487..1a51577bd4b345d008abf886e10764da86150984 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -1,5 +1,4 @@
 ---
-
 ceph_origin: repository
 ceph_repository: community
 cluster: test
@@ -29,3 +28,6 @@ nfs_ganesha_stable_branch: V2.5-stable
 nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
 nfs_ganesha_dev: false
 nfs_ganesha_flavor: "ceph_master"
+cephfs_pools:
+  - { name: "{{ cephfs_data }}", pgs: "8" }
+  - { name: "{{ cephfs_metadata }}", pgs: "8" }
\ No newline at end of file

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/mons b/tests/functional/ubuntu/16.04/cluster/group_vars/mons
deleted file mode 100644 (file)
index acb0949..0000000
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/mons
+++ /dev/null
@@ -1,4 +0,0 @@
----
-cephfs_pools:
-  - { name: "{{ cephfs_data }}", pgs: "8" }
-  - { name: "{{ cephfs_metadata }}", pgs: "8" }