summaryrefslogtreecommitdiffstats
path: root/inventory/aws/hosts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-11-28 15:32:46 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-11-29 12:41:14 -0500
commitcef42e2541f7ddeaf284b1350eed7f4e46234fe9 (patch)
treeec51eb6d9dc1d48daf336054ea5688e0f3107f13 /inventory/aws/hosts
parente5f352d6f7c7bd91c2784152a8805f6e22f407db (diff)
downloadopenshift-cef42e2541f7ddeaf284b1350eed7f4e46234fe9.tar.gz
openshift-cef42e2541f7ddeaf284b1350eed7f4e46234fe9.tar.bz2
openshift-cef42e2541f7ddeaf284b1350eed7f4e46234fe9.tar.xz
openshift-cef42e2541f7ddeaf284b1350eed7f4e46234fe9.zip
update tests and flake8/pylint fixes
Diffstat (limited to 'inventory/aws/hosts')
-rwxr-xr-xinventory/aws/hosts/ec2.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/inventory/aws/hosts/ec2.py b/inventory/aws/hosts/ec2.py
index 8b878cafd..7dfcd7889 100755
--- a/inventory/aws/hosts/ec2.py
+++ b/inventory/aws/hosts/ec2.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python2
+# pylint: skip-file
'''
EC2 external inventory script
@@ -482,7 +483,7 @@ class Ec2Inventory(object):
if e.error_code == 'AuthFailure':
error = self.get_auth_error_message()
else:
- backend = 'Eucalyptus' if self.eucalyptus else 'AWS'
+ backend = 'Eucalyptus' if self.eucalyptus else 'AWS'
error = "Error connecting to %s backend.\n%s" % (backend, e.message)
self.fail_with_error(error, 'getting EC2 instances')
@@ -700,7 +701,7 @@ class Ec2Inventory(object):
if self.nested_groups:
self.push_group(self.inventory, 'security_groups', key)
except AttributeError:
- self.fail_with_error('\n'.join(['Package boto seems a bit older.',
+ self.fail_with_error('\n'.join(['Package boto seems a bit older.',
'Please upgrade boto >= 2.3.0.']))
# Inventory: Group by tag keys
@@ -798,7 +799,7 @@ class Ec2Inventory(object):
self.push_group(self.inventory, 'security_groups', key)
except AttributeError:
- self.fail_with_error('\n'.join(['Package boto seems a bit older.',
+ self.fail_with_error('\n'.join(['Package boto seems a bit older.',
'Please upgrade boto >= 2.3.0.']))