Moved OSD directory variables into defaults.

diff --git a/group_vars/osds b/group_vars/osds
index c9b15606a3d8a11d8e6ac63d3eafb7e61e704b48..6aeda96804aa18d0b7e20da22d6f24b7495fa17a 100644 (file)
--- a/group_vars/osds
+++ b/group_vars/osds
@@ -57,5 +57,5 @@ dummy:
 # IV. Fourth scenario: use directory instead of disk for OSDs
 # Use 'true' to enable this scenario
 
-osd_directory: false
-osd_directories: [ '/var/lib/ceph/osd/mydir1', '/var/lib/ceph/osd/mydir2', '/var/lib/ceph/osd/mydir3', '/var/lib/ceph/osd/mydir4']
+#osd_directory: false
+#osd_directories: [ '/var/lib/ceph/osd/mydir1', '/var/lib/ceph/osd/mydir2', '/var/lib/ceph/osd/mydir3', '/var/lib/ceph/osd/mydir4']

diff --git a/roles/osd/defaults/main.yml b/roles/osd/defaults/main.yml
index 1cd76e3dbbd7801b18fb8a23c43cc03581542d1e..d1956881eea03d02cb4d7a2b2e639504e94fe8bd 100644 (file)
--- a/roles/osd/defaults/main.yml
+++ b/roles/osd/defaults/main.yml
@@ -53,3 +53,10 @@ raw_journal_device: /dev/sdb
 
 raw_multi_journal: false
 raw_journal_devices:  [ '/dev/sdb', '/dev/sdb', '/dev/sdc', '/dev/sdc' ]
+
+
+# IV. Fourth scenario: use directory instead of disk for OSDs
+# Use 'true' to enable this scenario
+
+osd_directory: false
+osd_directories: [ '/var/lib/ceph/osd/mydir1', '/var/lib/ceph/osd/mydir2', '/var/lib/ceph/osd/mydir3', '/var/lib/ceph/osd/mydir4']