Marius Gedminas
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
James Cammarata
0c5bbe3c32
Use the original (un-templated) args for include params
...
Fixes #12314
2015-09-11 00:53:27 -04:00
Brian Coca
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
James Cammarata
292e2da4e1
Fix some bugs related to facts/nonpersistent-facts cache split
...
Fixes #12313
2015-09-10 17:36:39 -04:00
Brian Coca
1e2dc212bd
added openvswitch_db
2015-09-10 17:27:12 -04:00
James Cammarata
444987cde6
Fix unit test for plugins after basedir/push_basedir removal
2015-09-10 17:01:52 -04:00
Brian Coca
91c9df2154
added verbosity to ansible-doc to make it easier to trace down issues
2015-09-10 16:50:14 -04:00
James Cammarata
b35529b09f
Submodule pointer update
2015-09-10 15:44:30 -04:00
James Cammarata
95a58d1178
Properly serialize UnsafeProxy objects
...
Required as part of fix for #12123
2015-09-10 14:01:02 -04:00
James Cammarata
a410bf26d3
Wrap registered variables in UnsafeProxy
...
Fixes #12123
2015-09-10 14:01:02 -04:00
Toshio Kuratomi
46bf3d1bc1
Remove plugin._basedirs as we now use different data structures to achieve that functionality.
2015-09-10 10:41:31 -07:00
Brian Coca
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
Abhijit Menon-Sen
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
Brian Coca
6dac8512a1
Merge pull request #12307 from jtyr/doc_fixes
...
Doc fixes
2015-09-10 09:17:22 -04:00
Jiri tyr
14dc16ca54
Adding missing colon to fix the block formating
2015-09-10 15:14:23 +02:00
Brian Coca
1fed03a6bd
Merge pull request #12308 from jtyr/comment_filter_v2
...
Resurrection of the comment filter
2015-09-10 08:53:51 -04:00
Jiri tyr
174f805fb3
Resurrection of the comment filter
2015-09-10 14:37:42 +02:00
Toshio Kuratomi
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
Marius Gedminas
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
Benno Joy
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
James Cammarata
ee7905c7e1
Compare include params against deprecated param names too
...
Fixes #12282
2015-09-09 22:15:50 -04:00
James Cammarata
950e067d2f
Merge pull request #12295 from napkindrawing/patch-3
...
Typo in comment: "bsaename" → "basename"
2015-09-09 21:41:13 -04:00
James Cammarata
f576e0f1af
Merge pull request #12300 from robusto/devel
...
Vault missing DataLoader for pwd file #12293
2015-09-09 18:52:31 -04:00
James Cammarata
22639a2a22
Fix mistake in fact setting to nonpersistent cache in VariableManager
...
Fixes #12301
2015-09-09 18:28:39 -04:00
James Cammarata
aa3b290efd
Fix indent on line in playbook executor
2015-09-09 18:10:38 -04:00
Toshio Kuratomi
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
James Cammarata
e81947c3b4
Fix vars_prompt short form support (and mark deprecated)
2015-09-09 17:52:44 -04:00
Rene Moser
f6382a160d
cloudstack: new integration test role test_cs_user
2015-09-09 22:36:19 +02:00
Blake Atkinson
6062519986
Vault missing DataLoader for pwd file #12293
2015-09-09 15:33:52 -05:00
James Cammarata
be7bd392cb
Fix unreachable host detection and have plays continue after unreachable failures
...
Fixes #12284
2015-09-09 15:27:26 -04:00
Toshio Kuratomi
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
Brian Coca
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
Brian Coca
3f0e14c2a0
disabled ssh closing connections
2015-09-09 14:21:46 -04:00
Toshio Kuratomi
e2c49b4ef4
Fix problem with "=" in the initial file path.
2015-09-09 11:14:31 -07:00
James Cammarata
56d7f3889d
Add new level of vars to deal with set_fact/register precedence rules
2015-09-09 12:21:07 -04:00
napkindrawing
172bbac97a
Typo in comment: "bsaename" → "basename"
2015-09-09 11:55:40 -04:00
James Cammarata
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
Toshio Kuratomi
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
Toshio Kuratomi
fa2edfa1ef
* Make sure we don't sometimes get byte strings instead of unicode strings
...
* Turn strings into byte strings before passing to shlex and turn them
back into unicode strings after they are retyurned from there
Fixes #12257
2015-09-09 01:24:11 -07:00
Toshio Kuratomi
e67459df86
Fix docstring of parse_value() to be informative
2015-09-09 01:24:11 -07:00
Marius Gedminas
ba0cf42ce9
Python 3: use six.string_types instead of basestring
...
Reduces the number of failing tests from 35 to 17.
2015-09-09 09:25:23 +03:00
Toshio Kuratomi
3a50393cf7
Merge pull request #12269 from mgedmin/py3k
...
Python 3: fix TypeError: unorderable types in test
2015-09-08 18:11:31 -07:00
Brian Coca
1f4c65ab9a
Merge pull request #12283 from kennethgillen/patch-1
...
s/rpmbuild/rpm-build
2015-09-08 14:27:11 -04:00
Kenny Gillen
00d2a80542
s/rpmbuild/rpm-build
...
When I followed these instructions, the generated path was 'rpm-build', not 'rpmbuild'. My rpm-build version is rpm-build-4.11.1-25.el7.x86_64 if that's relevant. Maybe this is 'just me', but wanted to feed back in case it's the same for everyone.
2015-09-08 17:59:53 +01:00
Toshio Kuratomi
1d7b493db3
Fix inclusion of the dynamic inventory scripts
2015-09-08 09:51:58 -07:00
Toshio Kuratomi
c1039de70c
Compatibility with six-1.3.0
2015-09-08 09:46:12 -07:00
James Cammarata
30399edada
Use UnsafeProxy for lookup results too
...
Also fixes a couple of bugs that popped up when using the proxy class
2015-09-08 12:19:39 -04:00
Brian Coca
f0411217e6
Merge pull request #12281 from wenottingham/patch-8
...
Update intro_windows.rst
2015-09-08 11:15:00 -04:00
Bill Nottingham
e2e15992b7
Update intro_windows.rst
...
Fix typo that broke RST -> html parsing.
2015-09-08 11:06:54 -04:00
Brian Coca
246e602fce
added note on ssh and sftp to managed node intro
2015-09-08 09:39:28 -04:00
