From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 23 May 2018 02:59:37 +0000 (+0200)
Subject: tests: move cephfs_pools variable
X-Git-Tag: v3.1.0rc4~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b00a3cf7906d96f7602991c490dd250995ea966e;p=ceph-ansible.git

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 e33f448af..4a6128afd 100644
--- 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 fb7a9268b..4b8817342 100644
--- 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 7ae0a37c9..be498905b 100644
--- 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
index acb09490a..000000000
--- 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 fb2804976..680f6ce65 100644
--- 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 d4d1d4334..4b5405947 100644
--- 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 f55fcdbce..1a51577bd 100644
--- 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
index acb09490a..000000000
--- 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" }