a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5195 from Multifarious/devel 

Fix loading from cache in ec2.py inventory plugin.
pull/4420/head
jctanner 2013-12-06 06:53:01 -08:00
parent a19ef93cf3 663deff2c2
commit 36a305ce9d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/inventory/ec2.py
View File

@ -131,12 +131,15 @@ except ImportError:
class Ec2Inventory(object): class Ec2Inventory(object):
def _empty_inventory(self):
return {"_meta" : {"hostvars" : {}}}
def __init__(self): def __init__(self):
''' Main execution path ''' ''' Main execution path '''
# Inventory grouped by instance IDs, tags, security groups, regions, # Inventory grouped by instance IDs, tags, security groups, regions,
# and availability zones # and availability zones
self.inventory = {"_meta" : {"hostvars" : {}}} self.inventory = self._empty_inventory()
# Index of hostname (address) to instance ID # Index of hostname (address) to instance ID
self.index = {} self.index = {}
@ -157,7 +160,7 @@ class Ec2Inventory(object):
elif self.args.list: elif self.args.list:
# Display list of instances for inventory # Display list of instances for inventory
if len(self.inventory) == 0: if self.inventory == self._empty_inventory():
data_to_print = self.get_inventory_from_cache() data_to_print = self.get_inventory_from_cache()
else: else:
data_to_print = self.json_format_dict(self.inventory, True) data_to_print = self.json_format_dict(self.inventory, True)