ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 20:08:41 +00:00
Code Packages Projects Releases Wiki Activity

Fix docker_swarm, docker_machine and gitlab_runners inventory plugins' verify method. (#67)

Browse Source
This commit is contained in:
Felix Fontein 2020-03-29 20:14:22 +02:00
parent 0560501336
commit 55f6a15338
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inventory/docker_machine.py
View File

@ -248,7 +248,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
"""Return the possibility of a file being consumable by this plugin.""" """Return the possibility of a file being consumable by this plugin."""
return ( return (
super(InventoryModule, self).verify_file(path) and super(InventoryModule, self).verify_file(path) and
path.endswith((self.NAME + '.yaml', self.NAME + '.yml'))) path.endswith(('docker_machine.yaml', 'docker_machine.yml')))
def parse(self, inventory, loader, path, cache=True): def parse(self, inventory, loader, path, cache=True):
super(InventoryModule, self).parse(inventory, loader, path, cache) super(InventoryModule, self).parse(inventory, loader, path, cache)

2
plugins/inventory/docker_swarm.py
View File

@ -244,7 +244,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
"""Return the possibly of a file being consumable by this plugin.""" """Return the possibly of a file being consumable by this plugin."""
return ( return (
super(InventoryModule, self).verify_file(path) and super(InventoryModule, self).verify_file(path) and
path.endswith((self.NAME + '.yaml', self.NAME + '.yml'))) path.endswith(('docker_swarm.yaml', 'docker_swarm.yml')))
def parse(self, inventory, loader, path, cache=True): def parse(self, inventory, loader, path, cache=True):
if not HAS_DOCKER: if not HAS_DOCKER: