Update filesystem.py

add ocfs2 support for module filesystem
Update setup.yml
delete trailing spaces
add ocsfs2 defaut var
Install ocfs2-tools for all linux
Testing ocfs2 on for Ubuntu - restrict blkid to be be done

test/integration/targets/filesystem/defaults/main.yml

@@ -11,5 +11,9 @@ tested_filesystems:
   ext2: {fssize: 10, grow: True}
   xfs: {fssize: 20, grow: False}  # grow requires a mounted filesystem
   btrfs: {fssize: 100, grow: False}  # grow not implemented
+<<<<<<< HEAD
   vfat: {fssize: 20, grow: True}
+=======
+  ocfs2: {fssize: 10, grow: False}  # grow not implemented
+>>>>>>> 6bf2591... add ocsfs2 defaut var
   # untested: lvm, requires a block device

test/integration/targets/filesystem/tasks/main.yml

@@ -12,6 +12,7 @@
     grow: '{{ item.value.grow }}'
   when:
     - 'not (item.key == "btrfs" and ansible_system == "FreeBSD")'
+    - 'not (item.key == "ocfs2" and ansible_system != "Ubuntu")'
     # On Ubuntu trusty, blkid is unable to identify filesystem smaller than 256Mo, see:
     # https://www.kernel.org/pub/linux/utils/util-linux/v2.21/v2.21-ChangeLog
     # https://anonscm.debian.org/cgit/collab-maint/pkg-util-linux.git/commit/?id=04f7020eadf31efc731558df92daa0a1c336c46c

test/integration/targets/filesystem/tasks/setup.yml

@@ -29,6 +29,12 @@
     with_items:
       - python-xml
       - btrfsprogs
+
+  - name: install ocfs2 (Ubuntu)
+    package:
+      name: ocfs2-tools
+      state: present
+    when: ansible_os_family == 'Ubuntu'
   when: ansible_system == 'Linux'
 
 - block: