Fix some variables

Couple of fixes

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/purge.yml b/purge.yml
index 44b29135d033fd5d6cadd674b60397266e2e7390..5848d4a9fc3a39a141cd8deaf550db6a171b96bf 100644 (file)
--- a/purge.yml
+++ b/purge.yml
@@ -6,6 +6,10 @@
   - mons
   - osds
 
+  vars:
+    devices: [ '/dev/sdb', '/dev/sdc', '/dev/sdd', '/dev/sde', '/dev/sdf' ]
+    partitions: [ '1', '2', '3' ]
+
   tasks:
 
   - name: Purge Ceph
@@ -24,5 +28,5 @@
     shell: parted -s {{ item[0] }} rm {{ item[1] }}
     with_nested:
       - devices
-      - ['1', '2']
+      - partitions
     ignore_errors: true

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 66eb2dd0f227a9a153dc6470c6b7e54ccc6cedc6..fbbb68116ff52e1e1d0841bbdeec5caa710553e1 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -3,9 +3,12 @@
 
 ## Setup options
 #
+
+# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
+#fsid:
 distro_release: "{{ facter_lsbdistcodename }}" # Seems to be not used.
 apt_key: http://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
-ceph_release: emperor
+ceph_release: firefly
 redhat_distro: el6 # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11
 
 ## Ceph options
@@ -47,4 +50,5 @@ osd_recovery_op_priority: 2
 
 ## Testing mode
 # enable this mode _only_ when you have a single node
-common_single_host_mode: true
+# if you don't want it keep the option commented
+#common_single_host_mode: true

diff --git a/roles/ceph-common/tasks/Debian.yml b/roles/ceph-common/tasks/Debian.yml
index 22d6cd5fed23baedcf095d740861b540875c77f6..5cbde7b968c9392795a7cf4f2844c471159f798d 100644 (file)
--- a/roles/ceph-common/tasks/Debian.yml
+++ b/roles/ceph-common/tasks/Debian.yml
@@ -19,6 +19,7 @@
   with_items:
     - python-pycurl
     - ntp
+    - hdparm
 
 - name: Install the Ceph key
   apt_key: data="{{ lookup('file', 'cephrelease.asc') }}" state=present

diff --git a/roles/ceph-common/tasks/RedHat.yml b/roles/ceph-common/tasks/RedHat.yml
index e36d54a480050cae77851e7fc856f68a7037f77b..bccf8addcf2e030f3e2b53ff76c80e9fa714c672 100644 (file)
--- a/roles/ceph-common/tasks/RedHat.yml
+++ b/roles/ceph-common/tasks/RedHat.yml
@@ -19,6 +19,7 @@
   with_items:
     - python-pycurl
     - ntp
+    - hdparm
 
 - name: Install the Ceph key
   rpm_key: key=cephrelease.asc state=present

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 889bb8f2d1c98998684ae9cf44034bbacacc2155..89fde5a2727c3e93c455eb94fd22dfc8a8e65725 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -3,6 +3,10 @@
 
 ## Ceph options
 #
+
+# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
+# fsid:
+# monitor_secret:
 cephx: true
 
 # Rados Gateway options

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index d1956881eea03d02cb4d7a2b2e639504e94fe8bd..845ef2208ec18b3334906d4f159e26c938f4d968 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -4,6 +4,9 @@
 
 ## Ceph options
 #
+
+# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
+# fsid:
 cephx: true
 
 # Devices to be used as OSDs