Commit e33a645c by John Jarvis

grab cache_path from the environment as well

parent 453ef55f
...@@ -217,7 +217,9 @@ class Ec2Inventory(object): ...@@ -217,7 +217,9 @@ class Ec2Inventory(object):
config.get('ec2', 'route53_excluded_zones', '').split(',')) config.get('ec2', 'route53_excluded_zones', '').split(','))
# Cache related # Cache related
if self.args.cache_path: if 'EC2_CACHE_PATH' in os.environ:
cache_path = os.environ['EC2_CACHE_PATH']
elif self.args.cache_path:
cache_path = self.args.cache_path cache_path = self.args.cache_path
else: else:
cache_path = config.get('ec2', 'cache_path') cache_path = config.get('ec2', 'cache_path')
......
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