ceph-defaults: move cephfs vars from the ceph-mon role

We're doing this so we can validate this in the ceph-validate role

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 081833491be02bdbfe218629f3e41c418630211e..896e1ff5d7617e4f1afbb5c8432d3e424f0940e2 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -336,6 +336,17 @@ monitor_address_block: subnet
 ip_version: ipv4
 mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
 
+##########
+# CEPHFS #
+##########
+cephfs: cephfs # name of the ceph filesystem
+cephfs_data: cephfs_data # name of the data pool for a given filesystem
+cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
+
+cephfs_pools:
+  - { name: "{{ cephfs_data }}", pgs: "" }
+  - { name: "{{ cephfs_metadata }}", pgs: "" }
+
 ## OSD options
 #
 journal_size: 5120 # OSD journal size in MB

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 3897b8b92f6155e3cd1a2f5649f6ad5415345a06..2de8bb1cf81608538091575d684b0eb25a3c5acd 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -29,18 +29,6 @@ calamari: false
 calamari_debug: false
 
 
-##########
-# CEPHFS #
-##########
-cephfs: cephfs # name of the ceph filesystem
-cephfs_data: cephfs_data # name of the data pool for a given filesystem
-cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
-
-cephfs_pools:
-  - { name: "{{ cephfs_data }}", pgs: "" }
-  - { name: "{{ cephfs_metadata }}", pgs: "" }
-
-
 ###############
 # CRUSH RULES #
 ###############