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
ca96d745
Commit
ca96d745
authored
Sep 25, 2013
by
nextus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#4227 in upstream repo
parent
776fc044
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
examples/ansible.cfg
+4
-1
lib/ansible/constants.py
+1
-0
lib/ansible/runner/connection_plugins/paramiko_ssh.py
+6
-5
No files found.
examples/ansible.cfg
View file @
ca96d745
...
...
@@ -98,9 +98,12 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins
# uncomment this line to cause the paramiko connection plugin to not record new host
# keys encountered. Increases performance on new host additions. Setting works independently of the
# host key checking setting above.
#record_host_keys=False
# by default, Ansible request a pseudo-terminal for commands execuded under sudo. Uncomment this
# line for override this behaviour.
#pty=False
[ssh_connection]
# ssh arguments to use
...
...
lib/ansible/constants.py
View file @
ca96d745
...
...
@@ -133,6 +133,7 @@ ANSIBLE_NOCOWS = get_config(p, DEFAULTS, 'nocows', 'ANSIBLE_NOCO
ANSIBLE_SSH_ARGS
=
get_config
(
p
,
'ssh_connection'
,
'ssh_args'
,
'ANSIBLE_SSH_ARGS'
,
None
)
ANSIBLE_SSH_CONTROL_PATH
=
get_config
(
p
,
'ssh_connection'
,
'control_path'
,
'ANSIBLE_SSH_CONTROL_PATH'
,
"
%(directory)
s/ansible-ssh-
%%
h-
%%
p-
%%
r"
)
PARAMIKO_RECORD_HOST_KEYS
=
get_config
(
p
,
'paramiko_connection'
,
'record_host_keys'
,
'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS'
,
True
,
boolean
=
True
)
PARAMIKO_PTY
=
get_config
(
p
,
'paramiko_connection'
,
'pty'
,
'ANSIBLE_PARAMIKO_PTY'
,
True
,
boolean
=
True
)
ZEROMQ_PORT
=
int
(
get_config
(
p
,
'fireball_connection'
,
'zeromq_port'
,
'ANSIBLE_ZEROMQ_PORT'
,
5099
))
ACCELERATE_PORT
=
int
(
get_config
(
p
,
'accelerate'
,
'accelerate_port'
,
'ACCELERATE_PORT'
,
5099
))
...
...
lib/ansible/runner/connection_plugins/paramiko_ssh.py
View file @
ca96d745
...
...
@@ -196,11 +196,12 @@ class Connection(object):
chan
.
exec_command
(
quoted_command
)
else
:
# sudo usually requires a PTY (cf. requiretty option), therefore
# we give it one, and we try to initialise from the calling
# environment
chan
.
get_pty
(
term
=
os
.
getenv
(
'TERM'
,
'vt100'
),
width
=
int
(
os
.
getenv
(
'COLUMNS'
,
0
)),
height
=
int
(
os
.
getenv
(
'LINES'
,
0
)))
# we give it one by default (pty=True in ansble.cfg), and we try
# to initialise from the calling environment
if
C
.
PARAMIKO_PTY
:
chan
.
get_pty
(
term
=
os
.
getenv
(
'TERM'
,
'vt100'
),
width
=
int
(
os
.
getenv
(
'COLUMNS'
,
0
)),
height
=
int
(
os
.
getenv
(
'LINES'
,
0
)))
shcmd
,
prompt
=
utils
.
make_sudo_cmd
(
sudo_user
,
executable
,
cmd
)
vvv
(
"EXEC
%
s"
%
shcmd
,
host
=
self
.
host
)
sudo_output
=
''
...
...
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