diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-29 16:39:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 16:39:32 -0500 |
| commit | e4a010aa08356e10fab9e9a4904dbd8491a74b8f (patch) | |
| tree | d146f1e12c8efb25fac17eff70e5e38d8d7db511 /inventory | |
| parent | f5a8207ad149fe8e67621b0b8fb585a48b3a1ca0 (diff) | |
| parent | 81d8b6a835de79f18b2cae87b7b58ba4d02f0b14 (diff) | |
| download | openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.gz openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.bz2 openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.xz openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.zip | |
Merge pull request #2855 from detiber/updateSchedulerDefaults
Update scheduler defaults
Diffstat (limited to 'inventory')
| -rwxr-xr-x | inventory/aws/hosts/ec2.py | 7 | ||||
| -rwxr-xr-x | inventory/gce/hosts/gce.py | 1 | ||||
| -rwxr-xr-x | inventory/libvirt/hosts/libvirt_generic.py | 1 | ||||
| -rwxr-xr-x | inventory/openstack/hosts/openstack.py | 1 |
4 files changed, 7 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.'])) diff --git a/inventory/gce/hosts/gce.py b/inventory/gce/hosts/gce.py index 99746cdbf..cce3c5f35 100755 --- a/inventory/gce/hosts/gce.py +++ b/inventory/gce/hosts/gce.py @@ -1,4 +1,5 @@ #!/usr/bin/env python2 +# pylint: skip-file # Copyright 2013 Google Inc. # # This file is part of Ansible diff --git a/inventory/libvirt/hosts/libvirt_generic.py b/inventory/libvirt/hosts/libvirt_generic.py index 1c9c17308..ac2f0430a 100755 --- a/inventory/libvirt/hosts/libvirt_generic.py +++ b/inventory/libvirt/hosts/libvirt_generic.py @@ -1,4 +1,5 @@ #!/usr/bin/env python2 +# pylint: skip-file ''' libvirt external inventory script diff --git a/inventory/openstack/hosts/openstack.py b/inventory/openstack/hosts/openstack.py index 0d92eae11..deefd3b5d 100755 --- a/inventory/openstack/hosts/openstack.py +++ b/inventory/openstack/hosts/openstack.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# pylint: skip-file # Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> # Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com> |