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
ed14312a
Commit
ed14312a
authored
Aug 01, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reinstate invalid argument checks where possible, daisy chainee/chained modules turn it off
parent
08999a2a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
lib/ansible/module_common.py
+6
-3
library/copy
+2
-0
library/file
+2
-8
library/get_url
+2
-0
No files found.
lib/ansible/module_common.py
View file @
ed14312a
...
...
@@ -54,7 +54,7 @@ except ImportError:
class AnsibleModule(object):
def __init__(self, argument_spec, bypass_checks=False, no_log=False):
def __init__(self, argument_spec, bypass_checks=False, no_log=False
, check_invalid_arguments=True
):
'''
common code for quickly building an ansible module in Python
(although you can write modules in anything that can return JSON)
...
...
@@ -66,8 +66,11 @@ class AnsibleModule(object):
self._legal_inputs = []
self._handle_aliases()
# temporarily disabled
# self._check_invalid_arguments()
# this may be disabled where modules are going to daisy chain into others
if check_invalid_arguments:
self._check_invalid_arguments()
self._set_defaults(pre=True)
if not bypass_checks:
...
...
library/copy
View file @
ed14312a
...
...
@@ -23,6 +23,8 @@ import shutil
def
main
():
module
=
AnsibleModule
(
# not checking because of daisy chain to file module
check_invalid_arguments
=
False
,
argument_spec
=
dict
(
src
=
dict
(
required
=
True
),
dest
=
dict
(
required
=
True
)
...
...
library/file
View file @
ed14312a
...
...
@@ -212,7 +212,8 @@ def rmtree_error(func, path, exc_info):
def
main
():
global
module
module
=
AnsibleFileModule
(
module
=
AnsibleModule
(
check_invalid_arguments
=
False
,
argument_spec
=
dict
(
state
=
dict
(
choices
=
[
'file'
,
'directory'
,
'link'
,
'absent'
],
default
=
'file'
),
path
=
dict
(
aliases
=
[
'dest'
,
'name'
],
required
=
True
),
...
...
@@ -348,12 +349,5 @@ def main():
# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
class
AnsibleFileModule
(
AnsibleModule
):
def
_check_invalid_arguments
(
self
):
# needed to support daisy chaining
pass
main
()
library/get_url
View file @
ed14312a
...
...
@@ -128,6 +128,8 @@ def main():
module
.
fail_json
(
msg
=
"urlparse is not installed"
)
module
=
AnsibleModule
(
# not checking because of daisy chain to file module
check_invalid_arguments
=
False
,
argument_spec
=
dict
(
url
=
dict
(
required
=
True
),
dest
=
dict
(
required
=
True
),
...
...
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