Commit 83810bd8 authored by Jürgen Haas's avatar Jürgen Haas
Browse files

Merge branch 'hotfix/Issue-9'

parents cb6392d9 7096f46e
......@@ -317,9 +317,11 @@ class Ec2Inventory(object):
cache_dir = os.path.join(cache_dir, 'profile_' + self.boto_profile)
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"
suffix = ''
if 'ANSIBLE_COMPANY' in os.environ:
suffix = '-' + os.environ['ANSIBLE_COMPANY']
self.cache_path_cache = cache_dir + "/ansible-ec2" + suffix + ".cache"
self.cache_path_index = cache_dir + "/ansible-ec2" + suffix + ".index"
self.cache_max_age = config.getint('ec2', 'cache_max_age')
if config.has_option('ec2', 'expand_csv_tags'):
......
......@@ -130,9 +130,11 @@ class JiffyBoxInventory(object):
cache_dir = os.path.expanduser(config.get('jiffybox', 'cache_path'))
if not os.path.exists(cache_dir):
os.makedirs(cache_dir)
self.cache_path_cache = cache_dir + "/ansible-jiffybox.cache"
self.cache_path_index = cache_dir + "/ansible-jiffybox.index"
suffix = ''
if 'ANSIBLE_COMPANY' in os.environ:
suffix = '-' + os.environ['ANSIBLE_COMPANY']
self.cache_path_cache = cache_dir + "/ansible-jiffybox" + suffix + ".cache"
self.cache_path_index = cache_dir + "/ansible-jiffybox" + suffix + ".index"
self.cache_max_age = config.getint('jiffybox', 'cache_max_age')
# Do we need to just include hosts that match a pattern?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment