grab cache_path from the environment as well

e33a645c · John Jarvis · 453ef55f · e33a645c
Commit e33a645c authored May 06, 2014 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

playbooks/ec2.py
+3 -1

No files found.
--- a/playbooks/ec2.py
+++ b/playbooks/ec2.py
@@ -217,7 +217,9 @@ class Ec2Inventory(object):
                config.get('ec2', 'route53_excluded_zones', '').split(','))

        # 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
        else:
            cache_path = config.get('ec2', 'cache_path')