summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-12 09:37:11 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-12 11:51:38 -0400
commit95161235972ec14fa7b2e10bc0ab21f5cce65db8 (patch)
tree73e1e53c9d19f214db421f0cd1aaf18304ef1509 /inventory
parentf0cec74c0bdcbdec69f148a5fa4b9a9985df5253 (diff)
downloadopenshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.gz
openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.bz2
openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.xz
openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.zip
Updated to read config first and default to users home dir
Diffstat (limited to 'inventory')
-rwxr-xr-xinventory/multi_ec2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py
index b7ce9e5dc..2cbf33473 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -78,7 +78,7 @@ class MultiEc2(object):
},
]
- self.config['cache_max_age'] = 0
+ self.config['cache_max_age'] = 300
else:
raise RuntimeError("Could not find valid ec2 credentials in the environment.")