1243686b90
Submodule update
2015-09-11 13:11:15 -04:00
6cf99cf614
Merge pull request #12328 from amenonsen/noneguard
...
Test state.tasks_child_state before dereferencing
2015-09-11 12:37:23 -04:00
049a48f3d3
Test state.tasks_child_state before dereferencing
...
I hit a traceback in the FAILED_TASKS case, but it seemed prudent to add
guards in the other similar branches.
2015-09-11 21:59:08 +05:30
df89f03627
Fixing precedence order for new nonpersistent vars (set_fact/register)
...
These used to go in vars_cache, so merging them in after that as they
are "live" variables and the user would most likely want to see these
above anything else.
2015-09-11 12:24:44 -04:00
49803509b4
Make sure include paths are templated before dwim in case they're absolute
...
Fixes #12327
2015-09-11 11:57:43 -04:00
4cdd9b2a82
Merge pull request #12318 from mgedmin/py3k
...
Python 3: make ansible.template.safe_eval() work
2015-09-11 10:44:37 -04:00
52f587cac3
Merge pull request #12325 from quinot/topic/wrong_interp_test
...
Test for Python must be against basename of interpreter
2015-09-11 09:47:49 -04:00
c2115c3715
Re-adding part of 926f127 which was actually fixing #12277
2015-09-11 09:45:27 -04:00
083aef65ad
Revert "set_fact should put facts in the fact_cache, not vars_cache"
...
This reverts commit 926f127245
2015-09-11 09:45:27 -04:00
0bc9223826
Test for Python must be against basename of interpreter
...
Followup on issue #12076
2015-09-11 13:29:34 +02:00
441a8af671
Merge pull request #12267 from h-hirokawa/add_replacer_jsonargs
...
Add the new module replacer <<INCLUDE_ANSIBLE_MODULE_JSON_ARGS>>.
2015-09-11 02:44:50 -04:00
f91b28ef23
Fix safe_eval() of set literals
...
There was code to support set literals (on Python 2.7 and newer), but it
was buggy: SAFE_NODES.union() doesn't modify SAFE_NODES in place,
instead it returns a new set object that is then silently discarded.
I added a unit test and fixed the code. I also changed the version
check to use sys.version_tuple instead of a string comparison, for
consistency with the subsequent Python 3.4 version check that I added in
the previous commit.
2015-09-11 09:41:05 +03:00
2b73002044
Python 3: make ansible.template.safe_eval() work
...
Two things changed in Python 3.4:
- 'basestring' is no longer defined, so use six.string_types
- True/False are now special AST node types (NamedConstant) rather than
just names
(Good thing we had tests, or I wouldn't have noticed the 2nd thing!)
I found only one place where safe_eval() is called inside the ansible
codebase: in lib/template/__init__.py. The call to safe_eval(result,
...) is protected by result.startswith('...'), which means result cannot
possibly be a byte string on Python 3 (or startswith() would raise, so
six.string_types (which excludes byte strings on Python 3) is fine here.
2015-09-11 09:37:44 +03:00
0c5bbe3c32
Use the original (un-templated) args for include params
...
Fixes #12314
2015-09-11 00:53:27 -04:00
5809a2e81d
Merge pull request #12299 from resmo/feature/test_cs_user
...
cloudstack: new integration test role test_cs_user
2015-09-10 20:09:59 -04:00
292e2da4e1
Fix some bugs related to facts/nonpersistent-facts cache split
...
Fixes #12313
2015-09-10 17:36:39 -04:00
1e2dc212bd
added openvswitch_db
2015-09-10 17:27:12 -04:00
444987cde6
Fix unit test for plugins after basedir/push_basedir removal
2015-09-10 17:01:52 -04:00
91c9df2154
added verbosity to ansible-doc to make it easier to trace down issues
2015-09-10 16:50:14 -04:00
b35529b09f
Submodule pointer update
2015-09-10 15:44:30 -04:00
95a58d1178
Properly serialize UnsafeProxy objects
...
Required as part of fix for #12123
2015-09-10 14:01:02 -04:00
a410bf26d3
Wrap registered variables in UnsafeProxy
...
Fixes #12123
2015-09-10 14:01:02 -04:00
46bf3d1bc1
Remove plugin._basedirs as we now use different data structures to achieve that functionality.
2015-09-10 10:41:31 -07:00
e6c9efec63
Merge pull request #12310 from amenonsen/hostport
...
Rename ansible_ssh_{host,port,user} in docs to ansible_*
2015-09-10 10:15:15 -04:00
f56a6e0951
Rename ansible_ssh_{host,port,user} in docs to ansible_*
...
The _ssh variants will continue to work, but the shorter, more generic
names are preferred now.
2015-09-10 19:41:47 +05:30
6dac8512a1
Merge pull request #12307 from jtyr/doc_fixes
...
Doc fixes
2015-09-10 09:17:22 -04:00
14dc16ca54
Adding missing colon to fix the block formating
2015-09-10 15:14:23 +02:00
1fed03a6bd
Merge pull request #12308 from jtyr/comment_filter_v2
...
Resurrection of the comment filter
2015-09-10 08:53:51 -04:00
174f805fb3
Resurrection of the comment filter
2015-09-10 14:37:42 +02:00
90e005d234
Merge pull request #12302 from mgedmin/py3k
...
Python 3: use the right PyYAML SafeRepresenter for unicode
2015-09-09 23:41:09 -07:00
b95e3d18a7
Python 3: use the right PyYAML SafeRepresenter for unicode
...
PyYAML has a SafeRepresenter in lib/... that defines
def represent_unicode(self, data):
return self.represent_scalar(u'tag:yaml.org,2002:str', data)
and a different SafeRepresenter in lib3/... that defines
def represent_str(self, data):
return self.represent_scalar('tag:yaml.org,2002:str', data)
so the right thing to do on Python 3 is to use represent_str.
(AnsibleUnicode is a subclass of six.text_type, i.e. 'str' on Python 3.)
2015-09-10 08:57:53 +03:00
6de13c3062
Merge pull request #11818 from Java1Guy/module_utils_ec2_for_ecs
...
change ec2 util to create only requested objects
2015-09-10 11:06:19 +05:30
ee7905c7e1
Compare include params against deprecated param names too
...
Fixes #12282
2015-09-09 22:15:50 -04:00
950e067d2f
Merge pull request #12295 from napkindrawing/patch-3
...
Typo in comment: "bsaename" → "basename"
2015-09-09 21:41:13 -04:00
f576e0f1af
Merge pull request #12300 from robusto/devel
...
Vault missing DataLoader for pwd file #12293
2015-09-09 18:52:31 -04:00
22639a2a22
Fix mistake in fact setting to nonpersistent cache in VariableManager
...
Fixes #12301
2015-09-09 18:28:39 -04:00
aa3b290efd
Fix indent on line in playbook executor
2015-09-09 18:10:38 -04:00
4b895f04e3
Fix order of loading of modules.
...
Allows ANSIBLE_LIBRARY to overload core modules even if the module in
ANSIBLE_LIBRARY doesn't have a .py extension.
2015-09-09 15:00:26 -07:00
e81947c3b4
Fix vars_prompt short form support (and mark deprecated)
2015-09-09 17:52:44 -04:00
f6382a160d
cloudstack: new integration test role test_cs_user
2015-09-09 22:36:19 +02:00
6062519986
Vault missing DataLoader for pwd file #12293
2015-09-09 15:33:52 -05:00
be7bd392cb
Fix unreachable host detection and have plays continue after unreachable failures
...
Fixes #12284
2015-09-09 15:27:26 -04:00
25c97fff69
Merge pull request #12294 from ansible/fix-password-lookup
...
Fix problem with "=" in the initial file path.
2015-09-09 11:48:30 -07:00
0dbebfddaa
Revert "remove closing connections after every task, this goes against conneciton caching and was not expected behaviuor nor inhertited from v1"
...
needed for winrm, disabled closing connections in ssh to avoid issues with that persistance, need to normalize all this in future
This reverts commit 23a22397bf
2015-09-09 14:21:56 -04:00
3f0e14c2a0
disabled ssh closing connections
2015-09-09 14:21:46 -04:00
e2c49b4ef4
Fix problem with "=" in the initial file path.
2015-09-09 11:14:31 -07:00
56d7f3889d
Add new level of vars to deal with set_fact/register precedence rules
2015-09-09 12:21:07 -04:00
172bbac97a
Typo in comment: "bsaename" → "basename"
2015-09-09 11:55:40 -04:00
926f127245
set_fact should put facts in the fact_cache, not vars_cache
...
Also fixes a template path lookup issue when using an include
Fixes #12277
2015-09-09 11:10:18 -04:00
e2e9319f06
Merge pull request #12287 from mgedmin/py3k
...
Python 3: use six.string_types instead of basestring
2015-09-09 01:35:46 -07:00
James Cammarata
Abhijit Menon-Sen
Brian Coca
Thomas Quinot
Marius Gedminas
Brian Coca
Toshio Kuratomi
Jiri tyr
Toshio Kuratomi
Benno Joy
Rene Moser
Blake Atkinson
napkindrawing