summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2014-12-18 15:56:19 -0500
committerKenny Woodson <kwoodson@redhat.com>2014-12-18 15:56:19 -0500
commit621dec2791c9a5ae992ac2a175f895e466196712 (patch)
treeaba523ff59e6919bb1ef5bad9737f48ec023912e
parentcf1b6517343189451bbfd64564e0fa3b2f346023 (diff)
parente1cebec7c5f1504512121de83d06afa0d1ecd21c (diff)
downloadopenshift-621dec2791c9a5ae992ac2a175f895e466196712.tar.gz
openshift-621dec2791c9a5ae992ac2a175f895e466196712.tar.bz2
openshift-621dec2791c9a5ae992ac2a175f895e466196712.tar.xz
openshift-621dec2791c9a5ae992ac2a175f895e466196712.zip
Merge pull request #43 from twiest/pr
fixed bug in multi_ec2.py where it was only allowing relatively path'd providers if you ran multi_ec2.py from the inventory directory.
-rwxr-xr-xinventory/multi_ec2.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py
index 97fd10f36..d8c2dc854 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -75,6 +75,10 @@ class MultiEc2(object):
if not env:
env = os.environ
+ # Allow relatively path'd providers in config file
+ if os.path.isfile(os.path.join(self.file_path, provider)):
+ provider = os.path.join(self.file_path, provider)
+
# check to see if provider exists
if not os.path.isfile(provider) or not os.access(provider, os.X_OK):
raise RuntimeError("Problem with the provider. Please check path " \