From: Alexis Lahouze <xals@lahouze.org>
Date: Tue, 8 Jul 2014 10:24:18 +0000 (+0200)
Subject: Moved OSD directory variables into defaults.
X-Git-Tag: v1.0.0~345^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d10d0747d5e5a8f2bdd0231cb22432106858cbe0;p=ceph-ansible.git

Moved OSD directory variables into defaults.
---

diff --git a/group_vars/osds b/group_vars/osds
index c9b15606a..6aeda9680 100644
--- 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 1cd76e3db..d1956881e 100644
--- 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']