cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
15962 commits 47 branches 390 tags 440 MiB
Commit graph

15962 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brian Coca
91a5d06c21 added note on os x file limits 2015-09-08 09:18:14 -04:00
Brian Coca
f1c72a55a5 Merge pull request #12261 from toshywoshy/12169 
added Manjaro as an Archlinux family
 2015-09-08 08:24:01 -04:00
Brian Coca
a424f3f7a5 Merge pull request #12278 from praveenkumar/doc_fix 
Update doc to use 'become' instead of 'sudo'
 2015-09-08 08:17:10 -04:00
Praveen Kumar
2fb98152ad Update doc to use 'become' instead of 'sudo' 2015-09-08 15:42:56 +05:30
Victor Costan
bd405169fb Fix #12258: don't wrap None in UnsafeProxy. 2015-09-08 04:02:04 -04:00
James Cammarata
ac6f61ec7f Properly handle group/host_var files with dots in them 
Fixes #12245
 2015-09-08 03:20:09 -04:00
James Cammarata
1eb5b42705 Don't double proxy unsafe variables 
Potential fix for #12260
 2015-09-08 02:50:07 -04:00
Toshio Kuratomi
dc945b8040 Merge pull request #12265 from ansible/fix-amazon-linux-rpm-build 
Potential fix for amazon linux's rpm doing something strange with the python_sitelib macro #12166
 2015-09-07 23:13:39 -07:00
Marius Gedminas
c22f4ee697 Add a comment explaining why async = 1 in the test 2015-09-07 19:46:05 +03:00
James Cammarata
8a7a37b535 Merge pull request #12268 from jaingaurav/ipv6 
Fix rsync connections to IPv6 addresses
 2015-09-07 03:04:01 -04:00
Marius Gedminas
1a1c9203e2 Python 3: fix TypeError: unorderable types in test 
The full error was

======================================================================
ERROR: test_task_executor_execute (units.executor.test_task_executor.TestTaskExecutor)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mg/src/ansible/test/units/executor/test_task_executor.py", line 252, in test_task_executor_execute
    mock_action.run.return_value = dict(ansible_facts=dict())
  File "/home/mg/src/ansible/lib/ansible/executor/task_executor.py", line 317, in _execute
    if self._task.async > 0:
TypeError: unorderable types: MagicMock() > int()

----------------------------------------------------------------------

Experiments show that Python 2 MagicMock() > 0 is true, so I'm setting
the async property on mock_task to 1.  (If I set it to 0, the test fails
anyway.)
 2015-09-07 09:49:28 +03:00
Gaurav Jain
6c107258fa Fix rsync connections to IPv6 addresses 
Similar to https://github.com/ansible/ansible/pull/11816 we can unconditionally
wrap the host address in square brackets. This is required by rsync for IPv6
addresses.
 2015-09-06 22:20:45 -07:00
Toshio Kuratomi
fab0e49f31 Potential fix for amazon linux's rpm doing something strange with the python_sitelib macro #12166 2015-09-06 09:08:34 -07:00
Toshio Kuratomi
718812d945 update submodule refs for documentation formatting 2015-09-05 08:56:15 -07:00
Toshio Kuratomi
26e109aa13 Update module refs 2015-09-05 08:27:48 -07:00
Toshaan Bharvani
4702d2be09 added Manjaro as an Archlinux family 2015-09-05 12:49:20 +02:00
James Cammarata
70677b030b Version bump for 2.0.0-0.2.alpha2 2015-09-04 16:50:37 -04:00
James Cammarata
ff9f5d7dc8 Starting to add additional unit tests for VariableManager 
Required some rewiring in inventory code to make sure we're using
the DataLoader class for some data file operations, which makes mocking
them much easier.

Also identified two corner cases not currently handled by the code, related
to inventory variable sources and which one "wins". Also noticed we weren't
properly merging variables from multiple group/host_var file locations
(inventory directory vs. playbook directory locations) so fixed as well.
 2015-09-04 16:41:38 -04:00
James Cammarata
87f75a50ad Use proxy class to mark variables unsafe for templating 
Fixes #12191
 2015-09-04 16:38:06 -04:00
Toshio Kuratomi
2d251cba45 Merge pull request #12256 from ansible/password-lookup-fix 
Use parse_kv to correctly parse parameters from password lookup
 2015-09-04 12:27:18 -07:00
Toshio Kuratomi
c68e04c185 Use parse_kv to correctly parse parameters from password lookup 
Fixes https://github.com/ansible/ansible-modules-core/issues/1968
 2015-09-04 12:18:46 -07:00
Brian Coca
c72cda0684 added 2 more modules to changelog 2015-09-04 12:59:19 -04:00
Brian Coca
6e5f3db9de updated submodule refs 2015-09-04 12:17:34 -04:00
Brian Coca
4705409c9e Merge pull request #12250 from bcoca/become_clean 
Become clean
 2015-09-04 10:49:45 -04:00
Brian Coca
c17fbf2f12 simplify become testing and handling, we had drifted and were doulbe checking prompt, become and become_pass 
fixed tests to conform to new signature and now tests both with and w/o password
now we are more explicit about self.prompt
 2015-09-04 10:36:16 -04:00
Brian Coca
eb0e7e198b remove closing connections after every task, this goes against conneciton caching and was not expected behaviuor nor inhertited from v1 2015-09-04 10:36:15 -04:00
Brian Coca
23a22397bf remove closing connections after every task, this goes against conneciton caching and was not expected behaviuor nor inhertited from v1 2015-09-04 10:11:25 -04:00
Toshio Kuratomi
a6de4b86a8 Merge pull request #12244 from mgedmin/py3k 
Python 3: use six.text_type instead of unicode
 2015-09-04 00:16:01 -07:00
Marius Gedminas
0eb0b56722 Replace type() checks with isinstance() 
Fixes the bug I introduced in my previous commit (six.string_types is
(basestring,) on Python 2).  Thanks @abadger for noticing!
 2015-09-04 09:47:17 +03:00
Marius Gedminas
37be9539ff Python 3: use six.text_type instead of unicode 
Replace 'unicode' with six.text_type, everywhere but in module_utils.
 2015-09-04 08:40:10 +03:00
James Cammarata
1840906f74 Merge pull request #12236 from amenonsen/ssh-cpdir 
Go back to using ~/.ansible/cp as the ControlPath
 2015-09-03 21:12:45 -04:00
Toshio Kuratomi
e218bf8da9 Do not escape backslashes when processing a template file. 
Fixes #12198
Fixes #12241
 2015-09-03 17:45:17 -07:00
Toshio Kuratomi
21ee4b02da Add more details to the changelog -- may move this to a porting guide 
later
 2015-09-03 15:24:16 -07:00
Abhijit Menon-Sen
7aa6cd3f63 Go back to using ~/.ansible/cp as the ControlPath 
This was commented out earlier because of the lack of interprocess
locking and prepare_writeable_dir in v2.

The locking was not needed: it could only protect against other siblings
of this process (since they were all locking a temporary file that was
opened in the parent), and those would be running as the same user and
with the same umask. Also, os.makedirs() tolerates intermediate paths
being created by other processes. For any other kind of error, both
locking and non-locking code paths would fail in the same way.

So all we really need to do is make sure we have write permissions.

(We also move the cp_dir handling code to where we actually set the
ControlPath ourselves; if the user has set it via ssh_*args already,
we don't need to bother.)
 2015-09-04 00:35:13 +05:30
James Cammarata
b2cb3153f1 Fix unit tests for PlayIterator changes regarding fact gathering 2015-09-03 14:25:43 -04:00
James Cammarata
4ac2bafc4b Set hosts fact gathering flag based on fact cache entries 
Fixes #12213
 2015-09-03 14:11:19 -04:00
Toshio Kuratomi
7ece767767 Merge pull request #12234 from ansible/travis-var-precedence 
Enable the var precedence test in travis
 2015-09-03 09:41:44 -07:00