summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2014-12-18 10:04:15 -0500
committerKenny Woodson <kwoodson@redhat.com>2014-12-18 10:04:15 -0500
commitd03b6eb42f160daca4f85b2005ba4c95d44356bd (patch)
tree4c8523edc75b1e7c8fde016f7b3d01b2c0569b23 /inventory
parentb1ef5ef85d01f0c22183fa01e0cc44f548f6b8a0 (diff)
downloadopenshift-d03b6eb42f160daca4f85b2005ba4c95d44356bd.tar.gz
openshift-d03b6eb42f160daca4f85b2005ba4c95d44356bd.tar.bz2
openshift-d03b6eb42f160daca4f85b2005ba4c95d44356bd.tar.xz
openshift-d03b6eb42f160daca4f85b2005ba4c95d44356bd.zip
Variable-ized the config file path with the name.
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 bb4751113..456bda8c8 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -23,7 +23,7 @@ class MultiEc2(object):
self.parse_cli_args()
# load yaml
- if os.path.isfile(os.path.join(self.file_path,"multi_ec2.yaml")):
+ if os.path.isfile(self.config_file):
self.config = self.load_yaml_config()
elif os.environ.has_key("AWS_ACCESS_KEY_ID") and os.environ.has_key("AWS_SECRET_ACCESS_KEY"):
self.config = {}