From 4af1d6098b35c7996d046c395650c497a313b733 Mon Sep 17 00:00:00 2001
From: James Tanner <tanner.jc@gmail.com>
Date: Fri, 21 Feb 2014 15:54:09 -0500
Subject: [PATCH] Fixes #5939 Allow for delegate hosts that are not in
inventory
---
lib/ansible/runner/__init__.py | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py
index 1a8d8ca7abd..2dc83c3c89b 100644
--- a/lib/ansible/runner/__init__.py
+++ b/lib/ansible/runner/__init__.py
@@ -303,7 +303,7 @@ class Runner(object):
def _compute_delegate(self, host, password, remote_inject):
""" Build a dictionary of all attributes for the delegate host """
-
+
delegate = {}
# allow ansible_ssh_host to be templated
@@ -324,13 +324,19 @@ class Runner(object):
this_host = delegate['host']
# get the vars for the delegate by it's name
- this_info = delegate['inject']['hostvars'][this_host]
+ if this_host in delegate['inject']['hostvars']:
+ this_info = delegate['inject']['hostvars'][this_host]
+ else:
+ # make sure the inject is empty for non-inventory hosts
+ this_info = {}
# get the real ssh_address for the delegate
delegate['ssh_host'] = this_info.get('ansible_ssh_host', delegate['host'])
delegate['port'] = this_info.get('ansible_ssh_port', port)
+
delegate['user'] = self._compute_delegate_user(this_host, delegate['inject'])
+
delegate['pass'] = this_info.get('ansible_ssh_pass', password)
delegate['private_key_file'] = this_info.get('ansible_ssh_private_key_file',
self.private_key_file)
@@ -355,9 +361,11 @@ class Runner(object):
actual_user = inject.get('ansible_ssh_user', self.remote_user)
thisuser = None
- if inject['hostvars'][host].get('ansible_ssh_user'):
- # user for delegate host in inventory
- thisuser = inject['hostvars'][host].get('ansible_ssh_user')
+ if host in inject['hostvars']:
+ if inject['hostvars'][host].get('ansible_ssh_user'):
+ # user for delegate host in inventory
+ thisuser = inject['hostvars'][host].get('ansible_ssh_user')
+
if thisuser is None and self.remote_user:
# user defined by play/runner
thisuser = self.remote_user