Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
ee268535
Commit
ee268535
authored
Oct 17, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix port overrides such that with fireball mode you don't have to specify an explicit port.
parent
aaa413db
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lib/ansible/playbook/__init__.py
+1
-1
lib/ansible/runner/__init__.py
+3
-1
No files found.
lib/ansible/playbook/__init__.py
View file @
ee268535
...
...
@@ -51,7 +51,7 @@ class PlayBook(object):
remote_user
=
C
.
DEFAULT_REMOTE_USER
,
remote_pass
=
C
.
DEFAULT_REMOTE_PASS
,
sudo_pass
=
C
.
DEFAULT_SUDO_PASS
,
remote_port
=
C
.
DEFAULT_REMOTE_PORT
,
remote_port
=
None
,
transport
=
C
.
DEFAULT_TRANSPORT
,
private_key_file
=
C
.
DEFAULT_PRIVATE_KEY_FILE
,
callbacks
=
None
,
...
...
lib/ansible/runner/__init__.py
View file @
ee268535
...
...
@@ -382,7 +382,9 @@ class Runner(object):
conn
=
None
actual_host
=
inject
.
get
(
'ansible_ssh_host'
,
host
)
actual_port
=
inject
.
get
(
'ansible_ssh_port'
,
port
)
actual_port
=
port
if
self
.
transport
in
[
'paramiko'
,
'ssh'
]:
actual_port
=
inject
.
get
(
'ansible_ssh_port'
,
port
)
# the delegated host may have different SSH port configured, etc
# and we need to transfer those, and only those, variables
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment