Accessing a node that doesn't exist throws an exception

This commit is contained in:
Daniel Hokka Zakrisson 2012-10-18 21:48:10 +02:00
parent 556799a7c4
commit 19797e1a29

View file

@ -391,9 +391,12 @@ class Runner(object):
delegate_to = inject.get('delegate_to', None)
if delegate_to is not None:
delegate_to = utils.template(self.basedir, delegate_to, inject)
delegate_info = inject['hostvars'][delegate_to]
actual_host = delegate_info.get('ansible_ssh_host', delegate_to)
actual_port = delegate_info.get('ansible_ssh_port', port)
try:
delegate_info = inject['hostvars'][delegate_to]
actual_host = delegate_info.get('ansible_ssh_host', delegate_to)
actual_port = delegate_info.get('ansible_ssh_port', port)
except errors.AnsibleError:
actual_host = delegate_to
try:
# connect