summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Keating <jesse.keating@rackspace.com>2013-11-27 13:58:11 -0800
committerJesse Keating <jesse.keating@rackspace.com>2013-11-27 13:58:11 -0800
commit5522d489e3266b6766e1b426bab15d8c1cd61fc6 (patch)
tree21cb9ca5e899901f6882548c2fe36132b513ea91
parent12ed39ef7b94b427e6125730786eb8a7a9cb0d84 (diff)
downloadansible-5522d489e3266b6766e1b426bab15d8c1cd61fc6.tar.gz
Avoid a traceback when using accelerate
This bit of code is attempting to access accelerate_inventory_host, which may not have been set/created. This will cause a traceback. Instead use getattr with a fallback to False.
-rw-r--r--lib/ansible/runner/connection_plugins/accelerate.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/runner/connection_plugins/accelerate.py b/lib/ansible/runner/connection_plugins/accelerate.py
index 39e19e271c..085c166288 100644
--- a/lib/ansible/runner/connection_plugins/accelerate.py
+++ b/lib/ansible/runner/connection_plugins/accelerate.py
@@ -86,7 +86,7 @@ class Connection(object):
def _execute_accelerate_module(self):
args = "password=%s port=%s debug=%d ipv6=%s" % (base64.b64encode(self.key.__str__()), str(self.accport), int(utils.VERBOSITY), self.runner.accelerate_ipv6)
inject = dict(password=self.key)
- if self.runner.accelerate_inventory_host:
+ if getattr(self.runner, 'accelerate_inventory_host', False):
inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.runner.accelerate_inventory_host))
else:
inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.host))