Merge branch 'master' into add_multi_tests

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 " \