From bdb27a16a8f004cd69db14c4846e84a7831be652 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 14 Aug 2014 14:08:52 +0200 Subject: [PATCH] Fix some variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Couple of fixes Signed-off-by: Sébastien Han --- purge.yml | 6 +++++- roles/ceph-common/defaults/main.yml | 8 ++++++-- roles/ceph-common/tasks/Debian.yml | 1 + roles/ceph-common/tasks/RedHat.yml | 1 + roles/ceph-mon/defaults/main.yml | 4 ++++ roles/ceph-osd/defaults/main.yml | 3 +++ 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/purge.yml b/purge.yml index 44b29135d..5848d4a9f 100644 --- 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 66eb2dd0f..fbbb68116 100644 --- 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 22d6cd5fe..5cbde7b96 100644 --- 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 e36d54a48..bccf8addc 100644 --- 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 889bb8f2d..89fde5a27 100644 --- 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 d1956881e..845ef2208 100644 --- 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 -- 2.39.5