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

15789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Abhijit Menon-Sen
cc6e53175f Mention |combine and the vault improvements in the CHANGELOG 2015-08-28 11:03:40 +05:30
Brian Coca
aa5f96d28d Merge pull request #12134 from smkr/devel 
- Fixed line break causing part of the text to display as "Definition List"  which Sphinx renders in bold.
 2015-08-27 23:54:58 -04:00
Steve McKuhr
f4fbfa6450 - Fixed line break causing part of the text to display as "Definition List" 
which Sphinx renders in bold.
 2015-08-27 21:41:36 -06:00
Brian Coca
48aa0dd1c7 now acknowledges ask_pass setting from ansible.cfg 
fixes #12111
 2015-08-27 18:22:36 -04:00
James Cammarata
399d215f5a Merge pull request #12122 from maty0609/devel 
Adding support for Archlinux and Slackware in fallback
 2015-08-27 16:55:43 -04:00
Toshio Kuratomi
9780658412 Merge pull request #12131 from ansible/py3-test 
Enable py34 test in travis so we don't regress recent fixes
 2015-08-27 13:24:56 -07:00
Toshio Kuratomi
1eee5ec6ff Enable py34 test in travis so we don't regress recent fixes 2015-08-27 13:20:52 -07:00
Toshio Kuratomi
6907166667 Merge pull request #12119 from mgedmin/py3k 
Some steps towards Python 3 support
 2015-08-27 12:18:16 -07:00
Marius Gedminas
c846bab69b Fix assert statement syntax 
`assert (condition, message)` gets parsed by Python as `assert
a_two_tuple`, and a 2-element tuple is never False.

Discovered by compileall on Python 3.4, which emits a SyntaxWarning for
this common mistake.
 2015-08-27 22:15:57 +03:00
Marius Gedminas
9e82ecaf91 Disable compileall test for contrib/ in tox -e py34 
(This is supposed to be temporary, until the code under contrib/ gets
cleaned up from all the remaining print statements.)
 2015-08-27 22:15:57 +03:00
Marius Gedminas
709dbbc7db Use 0oNNN octal syntax in test/ 2015-08-27 22:15:57 +03:00
Marius Gedminas
727cb8a917 Support print() function in test/ 2015-08-27 22:15:57 +03:00
Marius Gedminas
9ae66a7f5c Use 'except ... as' syntax in contrib/ and test/ too 2015-08-27 22:15:57 +03:00
Marius Gedminas
eb99aa8c68 Fix to_bytes(None) on Python 3 
You cannot call bytes(obj) to get a simple representation of obj on
Python 3!  E.g. bytes(42) returns a byte string with 42 NUL characters
instead of b'42'.
 2015-08-27 22:15:56 +03:00
Marius Gedminas
df1b41d3d3 Avoid types.NoneType 
types.NoneType was removed in Python 3.

None is a singleton in Python, so 'x is None' is equivalent to
'isinstance(x, NoneType)'.
 2015-08-27 22:15:56 +03:00
Marius Gedminas
da1e611b26 Support print as a function 
I neglected the __future__ import because

  print(one_thing)

works the same way even when print is a statement.
 2015-08-27 22:15:56 +03:00
Marius Gedminas
39196ec91e Drop the L suffix on numerical constants 
Python has had automatic int-to-long promotion for a long long time now.
Even Python 2.4 does that automatically.

Python 3 drops support for the L suffix altogether.
 2015-08-27 22:15:04 +03:00
Marius Gedminas
0eb538df03 Use 0oNNN octal syntax 
This syntax is valid in Python 2.6+ and 3.x.
 2015-08-27 22:15:04 +03:00
Marius Gedminas
47b088504d Don't mix tabs and spaces 
It's not allowed in Python 3 and merely a bad idea in Python 2.
 2015-08-27 22:15:04 +03:00
Marius Gedminas
0c6ce31f76 Use 'except ... as' syntax 
This syntax works on Python 2.6 through 3.x.  lib/ansible/module_utils
(and lib/ansible/modules) need to support Python 2.4, so I didn't touch
those.
 2015-08-27 22:15:04 +03:00
Brian Coca
2ac931d6c9 ported module_docs to use display 2015-08-27 14:57:50 -04:00
Brian Coca
2b28cdc0dd be more tolerant with non list descriptions 2015-08-27 14:57:50 -04:00
Toshio Kuratomi
86b2982005 Merge pull request #12112 from amenonsen/vault-stdio 
Implement cat-like filtering behaviour for encrypt/decrypt
 2015-08-27 11:26:48 -07:00
Toshio Kuratomi
db4a96a8d6 Merge pull request #12078 from amenonsen/hash_merge 
Add hash_merge and hash_merge_recursive filters with documentation
 2015-08-27 11:12:49 -07:00
Abhijit Menon-Sen
b328bc023d Add a combine filter with documentation 
This is based on some code from (closed) PR #7872, but reworked based on
suggestions by @abadger and the other core team members.

Closes #7872 by @darkk (hash_merge/hash_replace filters)
Closes #11153 by @telbizov (merged_dicts lookup plugin)
 2015-08-27 23:29:12 +05:30
James Cammarata
2df6513f8d Version bump for v2.0.0-0.1.alpha1 and submodule updates 2015-08-27 13:43:37 -04:00
Toshio Kuratomi
3f099ca0a2 Better way to stop tox running on unwanted directories 2015-08-27 10:41:46 -07:00
Toshio Kuratomi
ccb24d2919 Merge pull request #12098 from mgedmin/fix-tox-compileall 
Don't compile .py files under .tox/
 2015-08-27 10:34:03 -07:00
Brian Coca
6c9dc78d8c Merge pull request #12126 from amenonsen/vault-aes-deprecate 
Remove deprecated and unused VaultAES encryption code
 2015-08-27 13:09:28 -04:00
James Cammarata
1170a453c8 Merge pull request #12114 from ilya-epifanov/devel 
fixed hostvars access in conjunction with --limit usage
 2015-08-27 12:54:23 -04:00
Abhijit Menon-Sen
4afe1cf422 Update ansible-vault manpage to describe new encrypt/decrypt behaviour 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
090cfc9e03 More helpful prompts from ansible-vault encrypt/decrypt 
Now we issue a "Reading … from stdin" prompt if our input isatty(), as
gpg does. We also suppress the "x successful" confirmation message at
the end if we're part of a pipeline.

(The latter requires that we not close sys.stdout in VaultEditor, and
for symmetry we do the same for sys.stdin, though it doesn't matter in
that case.)
 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
b6de6e69a6 Also support output to stdout with no arguments 
This allows "cat plaintext|ansible-vault encrypt > ciphertext".
 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
e7eebb6954 Implement cat-like filtering behaviour for encrypt/decrypt 
This allows the following invocations:

    # Interactive use, like gpg
    ansible-vault encrypt --output x

    # Non-interactive, for scripting
    echo plaintext|ansible-vault encrypt --output x

    # Separate input and output files
    ansible-vault encrypt input.yml --output output.yml

    # Existing usage (in-place encryption) unchanged
    ansible-vault encrypt inout.yml

…and the analogous cases for ansible-vault decrypt as well.

In all cases, the input and output files can be '-' to read from stdin
or write to stdout. This permits sensitive data to be encrypted and
decrypted without ever hitting disk.
 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
32b38d4e29 Fix add_option indentation for consistency before adding another option 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
8fc8bf9439 Simplify VaultEditor methods 
We don't need to keep creating VaultLibs everywhere, and we don't need
to keep checking for errors because VaultLib does it already.
 2015-08-27 22:04:18 +05:30
Abhijit Menon-Sen
e99395f0c0 Don't create a VaultLib in each method; do it in __init__ instead 2015-08-27 22:04:18 +05:30
Brian Coca
ef594f708c remove old dead code 2015-08-27 12:27:38 -04:00
Abhijit Menon-Sen
4f3a98eff6 Update Vault tests to make sure AES decryption works 
Note that this test was broken in devel because it was really just
duplicating the AES256 test because setting v.cipher_name to 'AES'
no longer selected AES after it was de-write-whitelisted.

Now that we've removed the VaultAES encryption code, we embed static
output from an earlier version and test that we can decrypt it.
 2015-08-27 18:36:05 +05:30
Abhijit Menon-Sen
159887a6c9 Remove deprecated and unused VaultAES encryption code 
Now that VaultLib always decides to use AES256 to encrypt, we don't need
this broken code any more. We need to be able to decrypt this format for
a while longer, but encryption support can be safely dropped.
 2015-08-27 16:54:39 +05:30
maty0609
52e94468c9 Merge remote-tracking branch 'ansible/devel' into devel 2015-08-27 10:29:48 +01:00
maty0609
6f24e6f994 Adding support for Archlinux and Slackware in fallback 
In some cases Archlinux and Slackware is not detected by
platform.dist(). This should solve the issue.
 2015-08-27 10:22:02 +01:00
Chrrrles Paul
5ba3452b7e merged vmware_: vmkernel_ip_config, dvswitch, host, vmkernel, and dvs_portgroup 2015-08-26 18:33:49 -05:00
Brian Coca
b2bfe3502b make sure delimiter is basestring for cvsfile 
fixes #12062
 2015-08-26 18:38:39 -04:00
Ilya Epifanov
81bf88b6e0 fixed hostvars access in conjunction with --limit usage 2015-08-27 00:15:26 +03:00
James Cammarata
0441a7a217 Finishing off porting of chroot connection plugin 2015-08-26 16:43:06 -04:00
Toshio Kuratomi
017bd7b1cd Fix synchronize lookup of localhost info 2015-08-26 13:36:50 -07:00
James Cammarata
50448d68e1 Implement max_fail_percentage and any_errors_fatal support 
Fixes #11997
 2015-08-26 12:03:47 -04:00
James Cammarata
af41ba929c Add float and percent types for FieldAttributes 
Also sets the max_fail_percentage value to the percent type.
 2015-08-26 12:03:47 -04:00
Brian Coca
9f95720ef7 Merge pull request #12109 from docschick/devel 
ansible-lockdown added, minor editing
 2015-08-26 12:01:58 -04:00