Update freebsd.py

Add an 'r' which isn't required in local testing, but fails to pass merge tests.

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
Peter Whall 7 months ago committed by Abhijeet Kasurde
parent 679f064479
commit 1c83724933

@ -0,0 +1,3 @@
---
bugfixes:
- freebsd - update disk and slices regex for fact gathering (https://github.com/ansible/ansible/pull/82081).

@ -174,10 +174,40 @@ class FreeBSDHardware(Hardware):
sysdir = '/dev'
device_facts['devices'] = {}
# TODO: rc, disks, err = self.module.run_command("/sbin/sysctl kern.disks")
drives = re.compile(r'(ada?\d+|da\d+|a?cd\d+|amrd\d+|da\d+|idad\d+|ipsd\d+|md\d+|mfid\d+|mlxd\d+|twed\d+|vtbd\d+)')
slices = re.compile(
(r'(ada?\d+[ps]\d+\w*|a?cd\d+[ps]\d+\w*|amrd\d+[ps]\d+\w*|da\d+[ps]\d+\w*|idad\d+[ps]\d+\w*|ipsd\d+[ps]\d+\w*'
'|md\d+[ps]\d+\w*|mfid\d+[ps]\d+\w*|mlxd\d+[ps]\d+\w*|twed\d+[ps]\d+\w*|vtbd\d+[ps]\d+\w*)'))
drives = re.compile(
r"""(
ada?\d+| # ATA/SATA disk device
da\d+| # SCSI disk device
a?cd\d+| # SCSI CDROM drive
amrd\d+| # AMI MegaRAID drive
idad\d+| # Compaq RAID array
ipsd\d+| # IBM ServeRAID RAID array
md\d+| # md(4) disk device
mfid\d+| # LSI MegaRAID SAS array
mlxd\d+| # Mylex RAID disk
twed\d+| # 3ware ATA RAID array
vtbd\d+ # VirtIO Block Device
)
"""
)
slice = re.compile(
r"""(
ada?\d+[ps]\d+\w*| # ATA/SATA disk device
a?cd\d+[ps]\d+\w*| # SCSI CDROM drive
amrd\d+[ps]\d+\w*| # AMI MegaRAID drive
da\d+[ps]\d+\w*| # SCSI disk device
idad\d+[ps]\d+\w*| # Compaq RAID array
ipsd\d+[ps]\d+\w*| # IBM ServeRAID RAID array
md\d+[ps]\d+\w*| # md(4) disk device
mfid\d+[ps]\d+\w*| # LSI MegaRAID SAS array
mlxd\d+[ps]\d+\w*| # Mylex RAID disk
twed\d+[ps]\d+\w*| # 3ware ATA RAID array
vtbd\d+[ps]\d+\w* # VirtIO Block Device
)
"""
)
if os.path.isdir(sysdir):
dirlist = sorted(os.listdir(sysdir))
for device in dirlist:

Loading…
Cancel
Save