mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #9702 from bcoca/better_errors_on_delegate
better exception handling with delegated hosts
This commit is contained in:
commit
2ef5d6be1e
2 changed files with 16 additions and 16 deletions
|
@ -420,7 +420,7 @@ class Inventory(object):
|
|||
|
||||
group = self.get_group(groupname)
|
||||
if group is None:
|
||||
raise Exception("group not found: %s" % groupname)
|
||||
raise errors.AnsibleError("group not found: %s" % groupname)
|
||||
|
||||
vars = {}
|
||||
|
||||
|
@ -439,7 +439,7 @@ class Inventory(object):
|
|||
|
||||
host = self.get_host(hostname)
|
||||
if not host:
|
||||
raise Exception("host not found: %s" % hostname)
|
||||
raise errors.AnsibleError("host not found: %s" % hostname)
|
||||
return host.get_variables()
|
||||
|
||||
def get_host_variables(self, hostname, update_cached=False, vault_password=None):
|
||||
|
|
|
@ -394,20 +394,20 @@ class Runner(object):
|
|||
actual_user = inject.get('ansible_ssh_user', self.remote_user)
|
||||
thisuser = None
|
||||
|
||||
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')
|
||||
else:
|
||||
# look up the variables for the host directly from inventory
|
||||
try:
|
||||
host_vars = self.inventory.get_variables(host, vault_password=self.vault_pass)
|
||||
if 'ansible_ssh_user' in host_vars:
|
||||
thisuser = host_vars['ansible_ssh_user']
|
||||
except Exception, e:
|
||||
# the hostname was not found in the inventory, so
|
||||
# we just ignore this and try the next method
|
||||
pass
|
||||
try:
|
||||
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')
|
||||
else:
|
||||
# look up the variables for the host directly from inventory
|
||||
host_vars = self.inventory.get_variables(host, vault_password=self.vault_pass)
|
||||
if 'ansible_ssh_user' in host_vars:
|
||||
thisuser = host_vars['ansible_ssh_user']
|
||||
except errors.AnsibleError, e:
|
||||
# the hostname was not found in the inventory, so
|
||||
# we just ignore this and try the next method
|
||||
pass
|
||||
|
||||
if thisuser is None and self.remote_user:
|
||||
# user defined by play/runner
|
||||
|
|
Loading…
Reference in a new issue