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
This commit is contained in:
lchantre 2018-01-31 15:32:18 +01:00 committed by Brian Coca
parent 63e16431b7
commit 4f86bec977
4 changed files with 27 additions and 0 deletions

View file

@ -227,6 +227,15 @@ class Btrfs(Filesystem):
self.module.warn('Unable to identify mkfs.btrfs version (%r, %r)' % (stdout, stderr))
class Ocfs2(Filesystem):
MKFS = 'mkfs.ocfs2'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 02a7eb4... Update filesystem.py
class VFAT(Filesystem):
if get_platform() == 'FreeBSD':
MKFS = "newfs_msdos"
@ -248,6 +257,12 @@ class VFAT(Filesystem):
return [cmd, "-s", str(dev.size()), str(dev.path)]
=======
>>>>>>> 5128847... Update filesystem.py
=======
>>>>>>> e8781e5... delete trailing spaces
class LVM(Filesystem):
MKFS = 'pvcreate'
MKFS_FORCE_FLAGS = '-f'
@ -269,6 +284,7 @@ FILESYSTEMS = {
'xfs': XFS,
'btrfs': Btrfs,
'vfat': VFAT,
'ocfs2': Ocfs2,
'LVM2_member': LVM,
}

View file

@ -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

View file

@ -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

View file

@ -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: