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
304d06a5
Commit
304d06a5
authored
Nov 27, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1689 from sfromm/issue1644
Set LANG in module_common.py
parents
dd5a8474
6a68d381
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
0 deletions
+8
-0
hacking/test-module
+2
-0
lib/ansible/constants.py
+1
-0
lib/ansible/module_common.py
+3
-0
lib/ansible/runner/__init__.py
+2
-0
No files found.
hacking/test-module
View file @
304d06a5
...
...
@@ -84,6 +84,8 @@ def boilerplate_module(modfile, args):
module_data
=
module_data
.
replace
(
module_common
.
REPLACER
,
module_common
.
MODULE_COMMON
)
encoded_args
=
"
\"\"\"
%
s
\"\"\"
"
%
args
.
replace
(
"
\"
"
,
"
\\\"
"
)
module_data
=
module_data
.
replace
(
module_common
.
REPLACER_ARGS
,
encoded_args
)
encoded_lang
=
"
\"\"\"
%
s
\"\"\"
"
%
C
.
DEFAULT_MODULE_LANG
module_data
=
module_data
.
replace
(
module_common
.
REPLACER_LANG
,
encoded_lang
)
module_data
=
module_data
.
replace
(
'syslog.LOG_USER'
,
"syslog.
%
s"
%
C
.
DEFAULT_SYSLOG_FACILITY
)
modfile2_path
=
os
.
path
.
expanduser
(
"~/.ansible_module_generated"
)
...
...
lib/ansible/constants.py
View file @
304d06a5
...
...
@@ -77,6 +77,7 @@ DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None,
DEFAULT_PATTERN
=
get_config
(
p
,
DEFAULTS
,
'pattern'
,
None
,
'*'
)
DEFAULT_FORKS
=
get_config
(
p
,
DEFAULTS
,
'forks'
,
'ANSIBLE_FORKS'
,
5
)
DEFAULT_MODULE_ARGS
=
get_config
(
p
,
DEFAULTS
,
'module_args'
,
'ANSIBLE_MODULE_ARGS'
,
''
)
DEFAULT_MODULE_LANG
=
get_config
(
p
,
DEFAULTS
,
'module_lang'
,
'ANSIBLE_MODULE_LANG'
,
'C'
)
DEFAULT_TIMEOUT
=
get_config
(
p
,
DEFAULTS
,
'timeout'
,
'ANSIBLE_TIMEOUT'
,
10
)
DEFAULT_POLL_INTERVAL
=
get_config
(
p
,
DEFAULTS
,
'poll_interval'
,
'ANSIBLE_POLL_INTERVAL'
,
15
)
DEFAULT_REMOTE_USER
=
get_config
(
p
,
DEFAULTS
,
'remote_user'
,
'ANSIBLE_REMOTE_USER'
,
active_user
)
...
...
lib/ansible/module_common.py
View file @
304d06a5
...
...
@@ -17,12 +17,14 @@
REPLACER
=
"#<<INCLUDE_ANSIBLE_MODULE_COMMON>>"
REPLACER_ARGS
=
"<<INCLUDE_ANSIBLE_MODULE_ARGS>>"
REPLACER_LANG
=
"<<INCLUDE_ANSIBLE_MODULE_LANG>>"
MODULE_COMMON
=
"""
# == BEGIN DYNAMICALLY INSERTED CODE ==
MODULE_ARGS = <<INCLUDE_ANSIBLE_MODULE_ARGS>>
MODULE_LANG = <<INCLUDE_ANSIBLE_MODULE_LANG>>
BOOLEANS_TRUE = ['yes', 'on', '1', 'true', 1]
BOOLEANS_FALSE = ['no', 'off', '0', 'false', 0]
...
...
@@ -143,6 +145,7 @@ class AnsibleModule(object):
if add_file_common_args:
self.argument_spec.update(FILE_COMMON_ARGUMENTS)
os.environ['LANG'] = MODULE_LANG
(self.params, self.args) = self._load_params()
self._legal_inputs = []
...
...
lib/ansible/runner/__init__.py
View file @
304d06a5
...
...
@@ -537,6 +537,8 @@ class Runner(object):
module_data
=
module_data
.
replace
(
module_common
.
REPLACER
,
module_common
.
MODULE_COMMON
)
encoded_args
=
"
\"\"\"
%
s
\"\"\"
"
%
module_args
.
replace
(
"
\"
"
,
"
\\\"
"
)
module_data
=
module_data
.
replace
(
module_common
.
REPLACER_ARGS
,
encoded_args
)
encoded_lang
=
"
\"\"\"
%
s
\"\"\"
"
%
C
.
DEFAULT_MODULE_LANG
module_data
=
module_data
.
replace
(
module_common
.
REPLACER_LANG
,
encoded_lang
)
if
is_new_style
:
facility
=
C
.
DEFAULT_SYSLOG_FACILITY
if
'ansible_syslog_facility'
in
inject
:
...
...
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