mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 22:33:25 +00:00
[stable-1] Update CI (#1790)
* Update CI (#1782) * Update targets for CI for devel branch; move some targets to stable-2.10. * Skipping test on RHEL 8.3 (it is already skipped on RHEL 8.2). * Linting. * Shut 2.9/2.10 pylint complaints up. * More sanity. * Bump CI to FreeBSD 11.4, 12.2. (#1657) * Bump CI to FreeBSD 11.4, 12.2. * Make FreeBSD Python package selection more future-proof. (cherry picked from commitc1eb0a232c) * Add macOS 11.1 tests (#1619) * Add macOS 11.1 tests. * Hopefully fix virtualenv.sh problems. (cherry picked from commit74174f11ff) * Skip all postgresql tests on FreeBSD. * Skip kubevirt inventory tests on macOS.
This commit is contained in:
@@ -212,10 +212,8 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
|
||||
if config == 'rootfs' or config.startswith(('virtio', 'sata', 'ide', 'scsi')):
|
||||
value = ('disk_image=' + value)
|
||||
|
||||
if isinstance(value, int) or ',' not in value:
|
||||
value = value
|
||||
# split off strings with commas to a dict
|
||||
else:
|
||||
if not (isinstance(value, int) or ',' not in value):
|
||||
# split off strings with commas to a dict
|
||||
# skip over any keys that cannot be processed
|
||||
try:
|
||||
value = dict(key.split("=") for key in value.split(","))
|
||||
|
||||
@@ -217,7 +217,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||
yield host not in v
|
||||
yield True
|
||||
|
||||
return all([found_host for found_host in find_host(host, inventory)])
|
||||
return all(find_host(host, inventory))
|
||||
|
||||
def verify_file(self, path):
|
||||
|
||||
|
||||
Reference in New Issue
Block a user