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
88e8ecb6
Commit
88e8ecb6
authored
May 07, 2015
by
Matt Martz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Actually get the synchronize action plugin to work
parent
4f4df29c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
lib/ansible/plugins/action/synchronize.py
+13
-9
No files found.
lib/ansible/plugins/action/synchronize.py
View file @
88e8ecb6
...
@@ -51,7 +51,7 @@ class ActionModule(ActionBase):
...
@@ -51,7 +51,7 @@ class ActionModule(ActionBase):
path
=
self
.
_get_absolute_path
(
path
=
path
)
path
=
self
.
_get_absolute_path
(
path
=
path
)
return
path
return
path
def
_process_remote
(
self
,
host
,
task
,
path
,
user
):
def
_process_remote
(
self
,
host
,
path
,
user
):
transport
=
self
.
_connection_info
.
connection
transport
=
self
.
_connection_info
.
connection
return_data
=
None
return_data
=
None
if
not
host
in
[
'127.0.0.1'
,
'localhost'
]
or
transport
!=
"local"
:
if
not
host
in
[
'127.0.0.1'
,
'localhost'
]
or
transport
!=
"local"
:
...
@@ -71,7 +71,7 @@ class ActionModule(ActionBase):
...
@@ -71,7 +71,7 @@ class ActionModule(ActionBase):
def
run
(
self
,
tmp
=
None
,
task_vars
=
dict
()):
def
run
(
self
,
tmp
=
None
,
task_vars
=
dict
()):
''' generates params and passes them on to the rsync module '''
''' generates params and passes them on to the rsync module '''
original_transport
=
task_vars
.
get
(
'ansible_connection'
,
self
.
_connection_info
.
connection
)
original_transport
=
task_vars
.
get
(
'ansible_connection'
)
or
self
.
_connection_info
.
connection
transport_overridden
=
False
transport_overridden
=
False
if
task_vars
.
get
(
'delegate_to'
)
is
None
:
if
task_vars
.
get
(
'delegate_to'
)
is
None
:
task_vars
[
'delegate_to'
]
=
'127.0.0.1'
task_vars
[
'delegate_to'
]
=
'127.0.0.1'
...
@@ -79,7 +79,7 @@ class ActionModule(ActionBase):
...
@@ -79,7 +79,7 @@ class ActionModule(ActionBase):
if
original_transport
!=
'local'
:
if
original_transport
!=
'local'
:
task_vars
[
'ansible_connection'
]
=
'local'
task_vars
[
'ansible_connection'
]
=
'local'
transport_overridden
=
True
transport_overridden
=
True
self
.
runner
.
sudo
=
False
self
.
_connection_info
.
become
=
False
src
=
self
.
_task
.
args
.
get
(
'src'
,
None
)
src
=
self
.
_task
.
args
.
get
(
'src'
,
None
)
dest
=
self
.
_task
.
args
.
get
(
'dest'
,
None
)
dest
=
self
.
_task
.
args
.
get
(
'dest'
,
None
)
...
@@ -90,14 +90,14 @@ class ActionModule(ActionBase):
...
@@ -90,14 +90,14 @@ class ActionModule(ActionBase):
# from the perspective of the rsync call the delegate is the localhost
# from the perspective of the rsync call the delegate is the localhost
src_host
=
'127.0.0.1'
src_host
=
'127.0.0.1'
dest_host
=
task_vars
.
get
(
'ansible_ssh_host'
,
task_vars
.
get
(
'inventory_hostname'
)
)
dest_host
=
task_vars
.
get
(
'ansible_ssh_host'
)
or
task_vars
.
get
(
'inventory_hostname'
)
# allow ansible_ssh_host to be templated
# allow ansible_ssh_host to be templated
dest_is_local
=
dest_host
in
[
'127.0.0.1'
,
'localhost'
]
dest_is_local
=
dest_host
in
[
'127.0.0.1'
,
'localhost'
]
# CHECK FOR NON-DEFAULT SSH PORT
# CHECK FOR NON-DEFAULT SSH PORT
dest_port
=
self
.
_task
.
args
.
get
(
'dest_port'
)
dest_port
=
self
.
_task
.
args
.
get
(
'dest_port'
)
inv_port
=
task_vars
.
get
(
'ansible_ssh_port'
,
task_vars
.
get
(
'inventory_hostname'
)
)
inv_port
=
task_vars
.
get
(
'ansible_ssh_port'
)
or
task_vars
.
get
(
'inventory_hostname'
)
if
inv_port
!=
dest_port
and
inv_port
!=
task_vars
.
get
(
'inventory_hostname'
):
if
inv_port
!=
dest_port
and
inv_port
!=
task_vars
.
get
(
'inventory_hostname'
):
dest_port
=
inv_port
dest_port
=
inv_port
...
@@ -133,17 +133,18 @@ class ActionModule(ActionBase):
...
@@ -133,17 +133,18 @@ class ActionModule(ActionBase):
user
=
task_vars
[
'hostvars'
][
conn
.
delegate
]
.
get
(
'ansible_ssh_user'
)
user
=
task_vars
[
'hostvars'
][
conn
.
delegate
]
.
get
(
'ansible_ssh_user'
)
if
not
use_delegate
or
not
user
:
if
not
use_delegate
or
not
user
:
user
=
task_vars
.
get
(
'ansible_ssh_user'
,
self
.
runner
.
remote_user
)
user
=
task_vars
.
get
(
'ansible_ssh_user'
)
or
self
.
_connection_info
.
remote_user
if
use_delegate
:
if
use_delegate
:
# FIXME
# FIXME
private_key
=
task_vars
.
get
(
'ansible_ssh_private_key_file'
,
self
.
runner
.
private_key_file
)
private_key
=
task_vars
.
get
(
'ansible_ssh_private_key_file'
)
or
self
.
_connection_info
.
private_key_file
else
:
else
:
private_key
=
task_vars
.
get
(
'ansible_ssh_private_key_file'
,
self
.
runner
.
private_key_file
)
private_key
=
task_vars
.
get
(
'ansible_ssh_private_key_file'
)
or
self
.
_connection_info
.
private_key_file
if
private_key
is
not
None
:
if
private_key
is
not
None
:
private_key
=
os
.
path
.
expanduser
(
private_key
)
private_key
=
os
.
path
.
expanduser
(
private_key
)
self
.
_task
.
args
[
'private_key'
]
=
private_key
# use the mode to define src and dest's url
# use the mode to define src and dest's url
if
self
.
_task
.
args
.
get
(
'mode'
,
'push'
)
==
'pull'
:
if
self
.
_task
.
args
.
get
(
'mode'
,
'push'
)
==
'pull'
:
# src is a remote path: <user>@<host>, dest is a local path
# src is a remote path: <user>@<host>, dest is a local path
...
@@ -154,6 +155,9 @@ class ActionModule(ActionBase):
...
@@ -154,6 +155,9 @@ class ActionModule(ActionBase):
src
=
self
.
_process_origin
(
src_host
,
src
,
user
)
src
=
self
.
_process_origin
(
src_host
,
src
,
user
)
dest
=
self
.
_process_remote
(
dest_host
,
dest
,
user
)
dest
=
self
.
_process_remote
(
dest_host
,
dest
,
user
)
self
.
_task
.
args
[
'src'
]
=
src
self
.
_task
.
args
[
'dest'
]
=
dest
# Allow custom rsync path argument.
# Allow custom rsync path argument.
rsync_path
=
self
.
_task
.
args
.
get
(
'rsync_path'
,
None
)
rsync_path
=
self
.
_task
.
args
.
get
(
'rsync_path'
,
None
)
...
...
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