mds: fix fs pool creation

1. add the variables to docker_collocation
2. trigger the check when a MDS is part of the inventory file, not when
we run on an MDS...

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

diff --git a/roles/ceph-mon/tasks/check_mandatory_vars.yml b/roles/ceph-mon/tasks/check_mandatory_vars.yml
index 395838242632018439c55cd4241735339582665d..ce50ea9847152d0aad872ac4e8383827b850a278 100644 (file)
--- a/roles/ceph-mon/tasks/check_mandatory_vars.yml
+++ b/roles/ceph-mon/tasks/check_mandatory_vars.yml
@@ -12,5 +12,5 @@
     msg: "You must set pg num for your cephfs pools, see the cephfs_pools variable."
   with_items: "{{ cephfs_pools }}"
   when:
-    - inventory_hostname in groups.get(mds_group_name, [])
+    - groups.get(mds_group_name, []) | length > 0
     - item.pgs == ''

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