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
2222f6df
Commit
2222f6df
authored
Nov 22, 2013
by
Aleksey Ovcharenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to specify ansible_ssh_private_key_file location related to user home directory
parent
b11f96ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/ansible/runner/__init__.py
+2
-2
lib/ansible/runner/action_plugins/synchronize.py
+1
-1
No files found.
lib/ansible/runner/__init__.py
View file @
2222f6df
...
@@ -584,7 +584,7 @@ class Runner(object):
...
@@ -584,7 +584,7 @@ class Runner(object):
actual_user
=
inject
.
get
(
'ansible_ssh_user'
,
self
.
remote_user
)
actual_user
=
inject
.
get
(
'ansible_ssh_user'
,
self
.
remote_user
)
actual_pass
=
inject
.
get
(
'ansible_ssh_pass'
,
self
.
remote_pass
)
actual_pass
=
inject
.
get
(
'ansible_ssh_pass'
,
self
.
remote_pass
)
actual_transport
=
inject
.
get
(
'ansible_connection'
,
self
.
transport
)
actual_transport
=
inject
.
get
(
'ansible_connection'
,
self
.
transport
)
actual_private_key_file
=
inject
.
get
(
'ansible_ssh_private_key_file'
,
self
.
private_key_file
)
actual_private_key_file
=
os
.
path
.
expanduser
(
inject
.
get
(
'ansible_ssh_private_key_file'
,
self
.
private_key_file
)
)
self
.
sudo_pass
=
inject
.
get
(
'ansible_sudo_pass'
,
self
.
sudo_pass
)
self
.
sudo_pass
=
inject
.
get
(
'ansible_sudo_pass'
,
self
.
sudo_pass
)
if
self
.
accelerate
and
actual_transport
!=
'local'
:
if
self
.
accelerate
and
actual_transport
!=
'local'
:
...
@@ -623,7 +623,7 @@ class Runner(object):
...
@@ -623,7 +623,7 @@ class Runner(object):
actual_port
=
delegate_info
.
get
(
'ansible_ssh_port'
,
port
)
actual_port
=
delegate_info
.
get
(
'ansible_ssh_port'
,
port
)
actual_user
=
delegate_info
.
get
(
'ansible_ssh_user'
,
actual_user
)
actual_user
=
delegate_info
.
get
(
'ansible_ssh_user'
,
actual_user
)
actual_pass
=
delegate_info
.
get
(
'ansible_ssh_pass'
,
actual_pass
)
actual_pass
=
delegate_info
.
get
(
'ansible_ssh_pass'
,
actual_pass
)
actual_private_key_file
=
delegate_info
.
get
(
'ansible_ssh_private_key_file'
,
self
.
private_key_file
)
actual_private_key_file
=
os
.
path
.
expanduser
(
delegate_info
.
get
(
'ansible_ssh_private_key_file'
,
self
.
private_key_file
)
)
actual_transport
=
delegate_info
.
get
(
'ansible_connection'
,
self
.
transport
)
actual_transport
=
delegate_info
.
get
(
'ansible_connection'
,
self
.
transport
)
self
.
sudo_pass
=
delegate_info
.
get
(
'ansible_sudo_pass'
,
self
.
sudo_pass
)
self
.
sudo_pass
=
delegate_info
.
get
(
'ansible_sudo_pass'
,
self
.
sudo_pass
)
for
i
in
delegate_info
:
for
i
in
delegate_info
:
...
...
lib/ansible/runner/action_plugins/synchronize.py
View file @
2222f6df
...
@@ -79,7 +79,7 @@ class ActionModule(object):
...
@@ -79,7 +79,7 @@ class ActionModule(object):
if
not
dest_host
is
src_host
:
if
not
dest_host
is
src_host
:
user
=
inject
.
get
(
'ansible_ssh_user'
,
user
=
inject
.
get
(
'ansible_ssh_user'
,
self
.
runner
.
remote_user
)
self
.
runner
.
remote_user
)
private_key
=
inject
.
get
(
'ansible_ssh_private_key_file'
,
self
.
runner
.
private_key_file
)
private_key
=
os
.
path
.
expanduser
(
inject
.
get
(
'ansible_ssh_private_key_file'
,
self
.
runner
.
private_key_file
)
)
if
not
private_key
is
None
:
if
not
private_key
is
None
:
options
[
'private_key'
]
=
private_key
options
[
'private_key'
]
=
private_key
src
=
self
.
_process_origin
(
src_host
,
src
,
user
)
src
=
self
.
_process_origin
(
src_host
,
src
,
user
)
...
...
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