Commit graph

18190 commits

Author SHA1 Message Date
Matt Martz
439a385215 Catch TypeError on join, and if caught just return a single item, or a list of many 2016-02-20 16:17:58 -06:00
Brian Coca
d9246aacd0 fixed mount sizes for linux 2016-02-20 14:46:18 -05:00
Brian Coca
f1d2b9ea9e added size to mount facts on all non linux OSs
fixes #14528
2016-02-20 14:40:42 -05:00
Brian Coca
547afda8d4 Merge pull request #14546 from furlongm/devel
fix ansible_os_family fact on openSUSE Leap
2016-02-20 12:46:27 -05:00
Brian Coca
d87fd68287 Merge pull request #14560 from dagwieers/merge_hash_v2
Improve efficiency of merge_hash (Ansible v2.0)
2016-02-20 12:39:49 -05:00
Brian Coca
81368d8119 Merge pull request #14552 from kilburn/lsblk-dedup
Avoid duplicate /bin/lsblk calls in the setup module.
2016-02-20 12:24:22 -05:00
Sandra Wills
11f081cb99 minor typo fix
missing "the" added to 2.x listing to match wording for 1.x
2016-02-19 10:35:43 -05:00
Sandra Wills
c172a289e4 light editing of variable precedence list wording
QA had asked me a while ago to clean up the way the precedence list for 1.x was worded,
as the intro from the list started with "then comes", as if something should preceed
it. The comments from OxABAB were not helpful themselves, but his issue reminded me that
this was on my to do list to make a little cleaner and clearer.  Edits made to remove the
"then comes" intros for each list line, to help with clarity.
2016-02-19 10:32:34 -05:00
Brian Coca
c4e4dd351e added json callback to chnglog 2016-02-19 07:13:12 -08:00
Brian Coca
6febb816d2 Merge pull request #14569 from sivel/json-stdout-callback
Add json stdout callback
2016-02-19 07:12:30 -08:00
Brian Coca
abd948acb5 Merge pull request #14499 from gechr/gc-diff-context-lines
Make --diff lines of context configurable
2016-02-19 07:05:12 -08:00
George Christou
bbc855c218 Make --diff lines of context configurable 2016-02-19 12:18:09 +00:00
Will Thames
80ec66f64a Proposal for auto updating roles
Reflects discussion on ansible-devel.
2016-02-19 10:49:23 +00:00
Toshio Kuratomi
f9526b2ab2 Missed constants.py in the commit for #14557 2016-02-18 23:49:33 -08:00
Matt Martz
7f7536f7ad Add json callback to be used in replace of the default stdout to print a JSON structure to stdout 2016-02-18 16:39:31 -06:00
Brian Coca
844754b8e3 added missing config to constants.py
fixes #14567
2016-02-18 14:37:14 -08:00
Matt Martz
7bfb689de2 Merge pull request #8561 from sivel/vault-keyring-example
Add vault-keyring.py example script
2016-02-18 14:40:50 -06:00
Brian Coca
10b3738664 Merge pull request #14547 from amenonsen/github-templates
Update GitHub ISSUE and PULL_REQUEST templates
2016-02-18 09:09:55 -08:00
Brian Coca
0f73fb0d6f better error messages when failing to decrypt 2016-02-18 08:57:28 -08:00
Matt Davis
4c58066153 Merge pull request #14557 from ansible/display-play-args
Add a configuration setting that allows the user to specify printing …
2016-02-18 07:40:50 -08:00
Brian Coca
66dcd80196 added verbosity to debug to changelog 2016-02-18 07:03:51 -08:00
Dag Wieers
5a57139d91 Improve efficiency of merge_hash
This is related to #14559, but only the part for Ansible v2.0

This commit makes merging empty dicts, or equal dicts more efficient.

I noticed that while debugging merge_hash a lot of merges related to empty dictionaries and sometimes also identical dictionaries.
2016-02-18 16:03:11 +01:00
Brian Coca
5552c04976 allow skipping debug depending on verbosity 2016-02-18 06:58:43 -08:00
Brian Coca
fe09f7ee49 clarify that requirements are on host that runs it
fixes http://github.com/ansible/ansible-modules-core/issues/3061
2016-02-18 05:09:42 -08:00
Toshio Kuratomi
86b8dc0e79 Add a configuration setting that allows the user to specify printing of task arguments in the header.
Fixes #14554
2016-02-18 04:20:35 -08:00
Abhijit Menon-Sen
54cd2069e6 Use triple-backticks for verbatim output
It's easier than indenting by four spaces, as @willthames points out.
2016-02-18 16:11:47 +05:30
Brian Coca
93df09e387 added actionable to changelog 2016-02-18 02:32:42 -08:00
Brian Coca
1dba6da40f changed filtered to actionable cb plugin 2016-02-18 02:32:05 -08:00
Brian Coca
54942ee8ff Merge pull request #13593 from agaffney/devel
Add 'filtered' stdout callback plugin
2016-02-18 02:30:32 -08:00
Brian Coca
16bad6ddaa Merge pull request #14521 from mscherer/fix_14520
Remove spurious 'either', fix #14520
2016-02-18 02:25:11 -08:00
Abhijit Menon-Sen
2c723a135b Rename issue_template.md back to ISSUE_TEMPLATE.md
I can only assume that it was renamed because Github suddenly started
to act on ISSUE_TEMPLATE; but that's what we want now, so back it goes.
2016-02-18 15:53:01 +05:30
Abhijit Menon-Sen
ff8b48ca65 Create a PULL_REQUEST_TEMPLATE
Now that Github supports separate issue and PR templates, we can have a
separate cut-down version for PRs without all the things we ask for in a
new issue. The PR types are also removed from the ISSUE_TEMPLATE.
2016-02-18 15:53:01 +05:30
Abhijit Menon-Sen
905b156133 Edit the ISSUE_TEMPLATE
The old template was effusive at the expense of making the text harder
to read and easier to miss things in. This one is more direct, and easy
to scan quickly.
2016-02-18 15:53:01 +05:30
Brian Coca
d54d9dabe9 added specific info to deprecation message
should now show actual variable that is undefined
fixes #14526
2016-02-18 02:21:58 -08:00
Brian Coca
fcf9cdde01 updated diff info, added slack callback
also added note about callback new info access
2016-02-18 02:16:17 -08:00
Brian Coca
22082216a4 Merge pull request #13408 from sivel/v2-slack-callback
V2 slack callback plugin
2016-02-18 02:12:39 -08:00
Brian Coca
5948f8c6a2 Merge pull request #13412 from bcoca/playbook_display
added playbook and options info to callbacks
2016-02-18 02:12:06 -08:00
Brian Coca
6012646d8c added playbook and options info to callbacks
will display on certain verbosity levels, both playbook/file info
and non empty options with which it's running.
avoid errors when not using CLI classes
2016-02-18 02:09:07 -08:00
Brian Coca
0a4642fcc2 added examples for new diff color configs 2016-02-18 02:01:37 -08:00
Brian Coca
5300a2eafc Merge pull request #14491 from gechr/gc-simple-colour-diff
Add simple --diff colour support
2016-02-18 02:00:03 -08:00
Brian Coca
413abcf16d Merge pull request #14450 from bcoca/include_vars_merge
Include vars merge
2016-02-18 01:49:30 -08:00
Brian Coca
3e407ed743 Merge pull request #14490 from bcoca/stat_instead_of_checksum
Use stat module instead of checksum code
2016-02-18 01:45:50 -08:00
Brian Coca
3b3709e715 Merge pull request #14488 from bcoca/become_shell_fixes
shell + become fixes
2016-02-18 01:45:37 -08:00
Brian Coca
2b5fffa751 updated to use to_unicode as per feedback 2016-02-18 01:41:23 -08:00
Brian Coca
faa6eb30ae Merge pull request #14550 from wzzrd/manpage_typo
Fix a typo in man1/ansible
2016-02-18 01:13:09 -08:00
Marc Pujol
6779f91b88 Avoid duplicate /bin/lsblk calls in the setup module.
The setup module calls /bin/lsblk once for each device appearing in the /etc/mtab file. However, the same device appears there mutliple times when the system uses bind-mounts. As a result, /bin/lsblk is being called repeatedly to get the uuid of the same device.

On a system with many mounts, this leads to a TimeoutError in the get_mount_facts function of the setup module as described in #14551.

Fixes #14551
2016-02-18 09:15:07 +01:00
Maxim Burgerhout
275bd1b121 Fix a typo in man1/ansible 2016-02-18 08:29:58 +01:00
Marcus Furlong
90fb809f62 fix ansible_os_family fact on openSUSE Leap
ansible_os_family on openSUSE Leap has the wrong value:

        "ansible_os_family": "openSUSE Leap",

It should be:

        "ansible_os_family": "Suse",

This change fixes that by adding the relevant key and ensuring that dict
lookups replace ' ' with '_' so the key does not contain a space.
2016-02-18 14:36:52 +11:00
James Cammarata
517acb5773 Renaming ISSUE_TEMPLATE.md -> issue_template.md 2016-02-17 16:39:42 -05:00
b4ldr
439baf004e update uptime script to use version 2.0 of the api 2016-02-17 18:34:12 +00:00