From e1cebec7c5f1504512121de83d06afa0d1ecd21c Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Thu, 18 Dec 2014 12:59:55 -0500 Subject: 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. --- inventory/multi_ec2.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inventory') 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 " \ -- cgit v1.2.1