|
|
@ -806,7 +806,7 @@ class Ec2Inventory(object):
|
|
|
|
errors.append(' - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment vars found but may not be correct')
|
|
|
|
errors.append(' - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment vars found but may not be correct')
|
|
|
|
|
|
|
|
|
|
|
|
boto_paths = ['/etc/boto.cfg', '~/.boto', '~/.aws/credentials']
|
|
|
|
boto_paths = ['/etc/boto.cfg', '~/.boto', '~/.aws/credentials']
|
|
|
|
boto_config_found = list(p for p in boto_paths if os.path.isfile(os.path.expanduser(p)))
|
|
|
|
boto_config_found = [p for p in boto_paths if os.path.isfile(os.path.expanduser(p))]
|
|
|
|
if len(boto_config_found) > 0:
|
|
|
|
if len(boto_config_found) > 0:
|
|
|
|
errors.append(" - Boto configs found at '%s', but the credentials contained may not be correct" % ', '.join(boto_config_found))
|
|
|
|
errors.append(" - Boto configs found at '%s', but the credentials contained may not be correct" % ', '.join(boto_config_found))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|