Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for ansible_ssh_host and ansible_ssh_port #1378

Merged
merged 2 commits into from
Oct 18, 2012
Merged

Fixes for ansible_ssh_host and ansible_ssh_port #1378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ca655
Accessing a node that doesn't exist throws an exception
dhozac Oct 18, 2012
6701726
Port should be an integer
dhozac Oct 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/ansible/runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,16 @@ def _executor_internal_inner(self, host, module_name, module_args, inject, port,
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
conn = self.connector.connect(actual_host, actual_port)
conn = self.connector.connect(actual_host, int(actual_port))
if delegate_to:
conn.delegate = host

Expand Down