External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

controller_inventory.yml in addition to tower_inventory.yml

Browse Source
This commit is contained in:
Seth Foster
2021-05-10 13:54:33 -04:00
parent 39b26c8f0e
commit a7b29f6112
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx_collection/plugins/inventory/controller.py
View File

@@ -82,15 +82,26 @@ def handle_error(**kwargs):
class InventoryModule(BaseInventoryPlugin): class InventoryModule(BaseInventoryPlugin):
NAME = 'awx.awx.controller' # REPLACE NAME = 'awx.awx.controller' # REPLACE
# Stays backward compatible with the inventory script. # Stays backward compatible with the inventory script.
# If the user supplies '@tower_inventory' as path, the plugin will read from environment variables. # If the user supplies '@controller_inventory' as path, the plugin will read from environment variables.
no_config_file_supplied = False no_config_file_supplied = False
def verify_file(self, path): def verify_file(self, path):
if path.endswith('@tower_inventory'): if path.endswith('@controller_inventory') or path.endswith('@tower_inventory'):
self.no_config_file_supplied = True self.no_config_file_supplied = True
return True return True
elif super(InventoryModule, self).verify_file(path): elif super(InventoryModule, self).verify_file(path):
return path.endswith(('tower_inventory.yml', 'tower_inventory.yaml', 'tower.yml', 'tower.yaml')) return path.endswith(
(
'controller_inventory.yml',
'controller_inventory.yaml',
'controller.yml',
'controller.yaml',
'tower_inventory.yml',
'tower_inventory.yaml',
'tower.yml',
'tower.yaml',
)
)
else: else:
return False return False