ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix loading from cache in ec2.py inventory plugin.

Browse source
This commit is contained in:
Lorrin Nelson 2013-12-05 21:33:25 -08:00
parent 94d60b53de
commit 663deff2c2
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):
def _empty_inventory(self):
return {"_meta" : {"hostvars" : {}}}
def __init__(self):
''' Main execution path '''
# Inventory grouped by instance IDs, tags, security groups, regions,
# and availability zones
self.inventory = {"_meta" : {"hostvars" : {}}}
self.inventory = self._empty_inventory()
# Index of hostname (address) to instance ID
self.index = {}
@ -157,7 +160,7 @@ class Ec2Inventory(object):
elif self.args.list:
# 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()
else:
data_to_print = self.json_format_dict(self.inventory, True)