ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: move cephfs_pools variable 

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

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/2645/head
Guillaume Abrioux 2018-05-23 04:59:37 +02:00 committed by Sébastien Han
parent 564a662baf
commit a10e73d78d
8 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/functional/centos/7/cluster/group_vars/all
View File

@ -39,4 +39,7 @@ openstack_cinder_pool:
expected_num_objects: "" expected_num_objects: ""
openstack_pools: openstack_pools:
- "{{ openstack_glance_pool }}" - "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}" - "{{ openstack_cinder_pool }}"
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }

4
tests/functional/centos/7/cluster/group_vars/mons
View File

@ -1,8 +1,4 @@
--- ---
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }
create_crush_tree: True create_crush_tree: True
crush_rule_config: True crush_rule_config: True
crush_rule_hdd: crush_rule_hdd:

3
tests/functional/centos/7/docker-collocation/group_vars/all
View File

@ -22,3 +22,6 @@ ceph_conf_overrides:
devices: devices:
- /dev/sda - /dev/sda
- /dev/sdb - /dev/sdb
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }

4
tests/functional/centos/7/docker-collocation/group_vars/mons
View File

@ -1,4 +0,0 @@
---
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }

3
tests/functional/centos/7/docker/group_vars/all
View File

@ -41,3 +41,6 @@ openstack_cinder_pool:
openstack_pools: openstack_pools:
- "{{ openstack_glance_pool }}" - "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}" - "{{ openstack_cinder_pool }}"
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }

4
tests/functional/centos/7/docker/group_vars/mons
View File

@ -1,8 +1,4 @@
--- ---
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }
create_crush_tree: True create_crush_tree: True
crush_rule_config: True crush_rule_config: True
crush_rule_hdd: crush_rule_hdd:

4
tests/functional/ubuntu/16.04/cluster/group_vars/all
View File

@ -1,5 +1,4 @@
--- ---
ceph_origin: repository ceph_origin: repository
ceph_repository: community ceph_repository: community
cluster: test 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_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
nfs_ganesha_dev: false nfs_ganesha_dev: false
nfs_ganesha_flavor: "ceph_master" nfs_ganesha_flavor: "ceph_master"
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }

4
tests/functional/ubuntu/16.04/cluster/group_vars/mons
View File

@ -1,4 +0,0 @@
---
cephfs_pools:
- { name: "{{ cephfs_data }}", pgs: "8" }
- { name: "{{ cephfs_metadata }}", pgs: "8" }