From: Zack Cerza <zack@redhat.com>
Date: Tue, 14 Nov 2017 01:05:06 +0000 (-0700)
Subject: Omit XFS options on older OSes
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F349%2Fhead;p=ceph-cm-ansible.git

Omit XFS options on older OSes

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/roles/testnode/tasks/var_lib.yml b/roles/testnode/tasks/var_lib.yml
index 133b502e..324dc681 100644
--- a/roles/testnode/tasks/var_lib.yml
+++ b/roles/testnode/tasks/var_lib.yml
@@ -7,13 +7,19 @@
     path: "/var/lib/ceph"
     state: directory
 
+- name: Set xfs_opts on newer OSes
+  set_fact:
+    xfs_opts: "-m crc=0,finobt=0"
+  when: (ansible_distribution | lower == 'ubuntu' and ansible_distribution_major_version|int >= 16) or
+        (ansible_distribution | lower in ['centos', 'rhel'] and ansible_distribution_major_version|int >= 7)
+
 - name: "Create xfs filesystem on {{ var_lib_partition }}"
   filesystem:
     dev: "{{ var_lib_partition }}"
     fstype: xfs
     force: yes
     # Don't use a version 5 superblock as it's too new for some kernels
-    opts: "-m crc=0,finobt=0"
+    opts: "{{ xfs_opts|default('') }}"
 
 - name: "Mount {{ var_lib_partition }} to /var/lib/ceph"
   mount: