remove bad lines

add new line and update choice documentation
adding description for ocfs2 support
use correct variable ansible_distribution to test ocfs2 with Debian
distribution
use ansible_os_family for Debian
increase ocfs2 fs size to 20M (minimal size 11 instead of 10M)

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

@@ -11,9 +11,6 @@ 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
+  ocfs2: {fssize: 20, grow: False}  # grow not implemented
   # untested: lvm, requires a block device

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

@@ -12,7 +12,7 @@
     grow: '{{ item.value.grow }}'
   when:
     - 'not (item.key == "btrfs" and ansible_system == "FreeBSD")'
-    - 'not (item.key == "ocfs2" and ansible_system != "Ubuntu")'
+    - 'not (item.key == "ocfs2" and ansible_os_family != "Debian")'
     # 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

@@ -30,11 +30,11 @@
       - python-xml
       - btrfsprogs
 
-  - name: install ocfs2 (Ubuntu)
+  - name: install ocfs2 (Debian)
     package:
       name: ocfs2-tools
       state: present
-    when: ansible_os_family == 'Ubuntu'
+    when: ansible_os_family == 'Debian'
   when: ansible_system == 'Linux'
 
 - block: