From 111561f7829b517fb0b7577a0e2147292bdba58f Mon Sep 17 00:00:00 2001 From: Peter Sankauskas Date: Mon, 16 Jul 2012 16:13:48 -0700 Subject: [PATCH] Reading the config file from the same directory as the script, and fixing typo in security group name --- examples/scripts/ec2_external_inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/scripts/ec2_external_inventory.py b/examples/scripts/ec2_external_inventory.py index ba74ef4f34a..9c2733e6d88 100755 --- a/examples/scripts/ec2_external_inventory.py +++ b/examples/scripts/ec2_external_inventory.py @@ -168,7 +168,7 @@ class Ec2Inventory(object): ''' Reads the settings from the ec2.ini file ''' config = ConfigParser.SafeConfigParser() - config.read('ec2.ini') + config.read(os.path.dirname(os.path.realpath(__file__)) + '/ec2.ini') # Regions self.regions = [] @@ -265,7 +265,7 @@ class Ec2Inventory(object): # Inventory: Group by security group for group in instance.groups: - key = self.to_safe("security-group_" + group.name) + key = self.to_safe("security_group_" + group.name) self.push(self.inventory, key, dest) # Inventory: Group by tag keys