diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2014-12-18 15:56:33 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2014-12-18 15:56:33 -0500 |
| commit | 176065b2e6cf1cc065846d6cf17832df0e024b89 (patch) | |
| tree | 238f4229039149392acd99590bd51d2b6d0bca54 /inventory/multi_ec2.py | |
| parent | 6c3ec50a43692aeac1776e6247f2668fa24da501 (diff) | |
| parent | 621dec2791c9a5ae992ac2a175f895e466196712 (diff) | |
| download | openshift-176065b2e6cf1cc065846d6cf17832df0e024b89.tar.gz openshift-176065b2e6cf1cc065846d6cf17832df0e024b89.tar.bz2 openshift-176065b2e6cf1cc065846d6cf17832df0e024b89.tar.xz openshift-176065b2e6cf1cc065846d6cf17832df0e024b89.zip | |
Merge branch 'master' into add_multi_tests
Diffstat (limited to 'inventory/multi_ec2.py')
| -rwxr-xr-x | inventory/multi_ec2.py | 4 |
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 " \ |