External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-24 00:57:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add support for ec2 inventory plugin

Browse Source
This commit is contained in:
Jim Ladd
2019-01-23 17:25:51 -08:00
committed by AlanCoding
parent 622fbc116b
commit 7cce3cad06
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/inventory.py
View File

@@ -1942,8 +1942,20 @@ class azure_rm(PluginFileInjector):
class ec2(PluginFileInjector): class ec2(PluginFileInjector):
plugin_name = 'aws_ec2'
initial_version = '2.5'
ini_env_reference = 'EC2_INI_PATH' ini_env_reference = 'EC2_INI_PATH'
def inventory_as_dict(self, inventory_source):
ret = dict(
plugin='aws_ec2',
)
# TODO: all regions currently failing due to:
# https://github.com/ansible/ansible/pull/48079
if inventory_source.source_regions and 'all' not in inventory_source.source_regions:
ret['regions'] = inventory_source.source_regions.split(',')
return ret
def build_script_private_data(self, inventory_update, private_data_dir): def build_script_private_data(self, inventory_update, private_data_dir):
cp = configparser.RawConfigParser() cp = configparser.RawConfigParser()
# Build custom ec2.ini for ec2 inventory script to use. # Build custom ec2.ini for ec2 inventory script to use.

2
awx/main/tasks.py
View File

@@ -2071,7 +2071,7 @@ class RunInventoryUpdate(BaseTask):
src = inventory_update.source src = inventory_update.source
if src in CLOUD_PROVIDERS: if src in CLOUD_PROVIDERS:
if src in InventorySource.injectors: if src in InventorySource.injectors:
injector = InventorySource.injectors[inventory_update.source](self.get_ansible_version(inventory_update)) injector = InventorySource.injectors[src](self.get_ansible_version(inventory_update))
if injector.should_use_plugin(): if injector.should_use_plugin():
content = injector.inventory_contents(inventory_update, private_data_dir) content = injector.inventory_contents(inventory_update, private_data_dir)
# must be a statically named file # must be a statically named file