Merge pull request #5153 from willthames/ec2_inventory_multiuser

Allow multiple users to use ec2 inventory scripts
This commit is contained in:
jctanner 2014-01-06 12:55:08 -08:00
commit fd4ae165e4
2 changed files with 7 additions and 4 deletions

View file

@ -223,9 +223,12 @@ class Ec2Inventory(object):
config.get('ec2', 'route53_excluded_zones', '').split(','))
# Cache related
cache_path = config.get('ec2', 'cache_path')
self.cache_path_cache = cache_path + "/ansible-ec2.cache"
self.cache_path_index = cache_path + "/ansible-ec2.index"
cache_dir = os.path.expanduser(config.get('ec2', 'cache_path'))
if not os.path.exists(cache_dir):
os.makedirs(cache_dir)
self.cache_path_cache = cache_dir + "/ansible-ec2.cache"
self.cache_path_index = cache_dir + "/ansible-ec2.index"
self.cache_max_age = config.getint('ec2', 'cache_max_age')