wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12039 commits 42 branches 295 tags 186 MiB
Commit graph

3163 commits

Author SHA1 Message Date
James Cammarata
43154e5101 Using custom splitting function for module param counting 2014-07-24 14:42:35 -05:00
Michael DeHaan
e143d7dab7 Merge pull request #7543 from yangliping/fix_local_facts_file_checking_portability 
Fix portability issue when checking local facts file permission.
 2014-07-24 09:37:22 -04:00
Michael DeHaan
635bea645c Merge pull request #7992 from dehylton/devel 
fix swap translation on 4.x openbsd with 2.5.4 python
 2014-07-24 09:34:38 -04:00
James Cammarata
b21875d5a9 Make sure 'item' variable is set when using first_available_file 
Fixes #8220
 2014-07-24 00:05:26 -05:00
someda
1b1d5d0d3d fix an issue that copying directory will fail when trying to change file attributes and the target file already exists on remote 
- the issue was introduced by the commit 84759faa09
 2014-07-24 14:03:36 +09:00
James Cammarata
2cc602beea Fixes for module param counting and additional shell quoting issues 2014-07-23 22:54:59 -05:00
Benno Joy
ac85d8444b fix for unarchive 8257 2014-07-23 14:50:16 +00:00
Nacho Coloma
57428c48a2 Bugfix: bulletproof unexpected_error_msg at gce.py 
This method was still failing for me with a "missing http_code" message. After applying this change, the error message is:

```
msg: Unexpected response: {'value': 'PyCrypto library required for Service Account Authentication.'}
```

I wanted to contribute a rock-solid `unexpected_error_msg` implementation.
 2014-07-23 16:45:24 +02:00
James Cammarata
84759faa09 Security fixes: 
* Strip lookup calls out of inventory variables and clean unsafe data
  returned from lookup plugins (CVE-2014-4966)
* Make sure vars don't insert extra parameters into module args and prevent
  duplicate params from superseding previous params (CVE-2014-4967)
 2014-07-21 11:20:49 -05:00
James Cammarata
00e089e503 Revert "Explicitly set the user option for ssh connections" 
This reverts commit 0f91add86f.

Fixes #8216
 2014-07-21 10:32:55 -05:00
Joseph Benden
da5e32b316 Needs additional divisor. 2014-07-18 07:55:24 -07:00
Michael DeHaan
0fad9575e9 Refine error message about invalid ops since people forget to indent tasks fairly often. 2014-07-17 10:13:10 -04:00
James Cammarata
0e5b0a2e97 Revert "Set Jinja2's keep_trailing_newline=True in template_from_string." 
This reverts commit 7a8eb0b670.
 2014-07-17 09:07:04 -05:00
Joseph Benden
b55791ef43 Support for OS X 10.10 DP3. 2014-07-16 12:37:11 -07:00
James Cammarata
62e9cf63b7 Merge pull request #8170 from sergevanginderachter/issue_8159 
Load existing group_vars file for new group_by group
 2014-07-16 14:28:14 -05:00
Serge van Ginderachter
4e9a253bef Load existing group_vars file for new group_by group 
if it was not loaded yet, which happens if that group
didn't exist yet in the inventory.

fixes #8159
 2014-07-16 21:16:27 +02:00
James Cammarata
42b5294820 Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel 2014-07-16 14:02:13 -05:00
Felix Geyer
0ebd19e97b Fix regression: Sanitize sudo success_key from stdout 
Commit 7e3dd10 caused a regression with sanitizing the sudo success_key from stdout.
There is no newline in front of SUDO-SUCCESS when using sudo.
This change adapts the regex to make the line break optional.

Tested on Ubuntu 14.04.
 2014-07-16 18:14:35 +02:00
Ruggero Marchei
909955f2e2 fix get_distribution_version() on amazon linux 2014-07-15 18:04:46 +02:00
Jacob Leverich
7a8eb0b670 Set Jinja2's keep_trailing_newline=True in template_from_string. 
Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
 2014-07-14 13:36:17 -07:00
James Cammarata
e74853300a Merge branch 'task-host-loop-bypass' of https://github.com/sivel/ansible into sivel-task-host-loop-bypass 2014-07-14 14:21:25 -05:00
James Cammarata
cdb9f13559 Merge pull request #7605 from sivel/delegate-callback-hint 
Show delegate_to hint in callback output
 2014-07-14 11:10:52 -05:00
James Cammarata
4fc8d4b6fe Merge pull request #7649 from sivel/vault-password-script 
Allow --vault-password-file to work with a script as well as a flat file
 2014-07-14 10:57:16 -05:00
Serge van Ginderachter
e8b45a9ef7 Invalidate host/group variables cache when loading 
extra varsiables based on playbook basedir.
 2014-07-14 15:21:33 +02:00
Serge van Ginderachter
d39ff55688 Fix logic bug when loading vars for a new playbook basedir. 2014-07-14 15:12:53 +02:00
James Cammarata
db96344966 Re-fixing ability to have empty json files after inventory refactoring 2014-07-11 13:20:00 -05:00
James Cammarata
4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 2014-07-10 14:43:07 -05:00
Bjorn Neergaard
08f97c0b9d Fix hostname when get_distribution_version() returns a string. 
The distro version is a string ('jessie/sid') on Debian unstable and testing.
Because load_platform_subclass() evaluations every subclass as it loops,
comparing numbers when get_distribution_version() does not return a number will
break.

This patch fixes that by returning a number (`0`) when we have an invalid
version, instead of returning `None` or a string.
 2014-07-10 11:27:03 -07:00
Dan Slimmon
307a3e8a9c Fixed regex square-bracket bug. 
Regexes were being parsed like ordinary ansible host patterns, so
square-bracket groups were getting interpolated wrongly.
 2014-07-10 00:08:12 +00:00
James Cammarata
b8ac094eaa Tweak to only show msg on assert failure if set 2014-07-08 14:05:24 -05:00
James Cammarata
16332b8488 Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg 2014-07-08 13:56:08 -05:00
James Cammarata
aa261bdd14 Optimizing groups_for_host() lookup in inventory 2014-07-07 21:08:39 -05:00
James Cammarata
fe892fccb1 Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor 2014-07-07 14:16:37 -05:00
James Cammarata
11a5fc85f4 Merge branch 'inventory_refactoring' into svg_and_inventory_refactor 2014-07-07 13:11:58 -05:00
James Cammarata
bcf83cbc24 Merge branch 'sergevanginderachter-inventorytree' into svg_and_inventory_refactor 2014-07-07 13:11:52 -05:00
Serge van Ginderachter
ff4119adc0 Performance optimization in resolving host patterns 
Avoid resolving a pattern that is a plain host. When matching a hostname in the
hosts_cache, just use the host object from there.

When running a task on say 750 hosts, this yields a huge improvement.
 2014-07-07 12:50:50 -05:00
Matt Martz
6591dd560d Show delegate_to hint in callbacks 2014-07-07 12:39:08 -05:00
Leonid Evdokimov
d94395f48c assert: add optional msg argument 
Sample playbook when it may be useful:
```
- uri: return_content=yes url={{ api_base }}/action/{{ inventory_hostname }}
  register: output
- assert:
    msg: '{{ output.json | to_nice_json }}'
    that:
      - output.json.foo != "bar"
      - output.json.boo == 42
```
 2014-07-07 19:05:17 +04:00
James Cammarata
7f8de3a265 Merge pull request #8024 from kcghost/7941 
removed port from domain name qualification, fixes #7941
 2014-07-04 23:15:17 -05:00
James Cammarata
ff04b2b532 Allow empty yaml vars files 
Fixes #7843
 2014-07-04 23:10:32 -05:00
Michael DeHaan
51e014d915 Merge pull request #8012 from cchurch/callback_cleanup 
Callback plugin cleanup
 2014-07-03 19:29:59 -05:00
Michael DeHaan
c2ac8fda1e Data from inventory scripts should be able to use nested Jinja2 expressions. 2014-07-03 16:11:14 -04:00
Henry Finucane
de64bbdc5f Support a whitelisted subset of jinja2 template options 2014-07-02 21:14:26 -07:00
Casey Fitzpatrick
7115cb1f37 removed port from domain name qualification, fixes 7941 2014-07-02 19:54:50 -04:00
Marc Abramowitz
5b783e0bc6 Error if private_key_file is group/world readable 
Currently, if you have this, ansible fails with a generic error and
suggests running again with `-vvvv`. This isn't bad but pinpointing the
specific problem immediately is even more user-friendly.

```
$ ls -l devops.pem
-rw-r--r--+ 1 marca  staff  1679 Jul  2 11:25 devops.pem

$ ansible -m ping --private-key=devops.pem mt3-pyweb01
mt3-pyweb01 | FAILED => private_key_file (devops.pem) is group-readable or world-readable and thus insecure - you will probably get an SSH failure
```
 2014-07-02 13:44:53 -07:00
James Cammarata
81f35323e9 Revert "Fix get_distribution() for platforms that may have spaces" 
This reverts commit 2493020d9f.
 2014-07-02 09:44:44 -05:00
Chris Church
955dadf743 Remove runner_on_error callback that is never used. 2014-07-01 17:02:10 -04:00
Chris Church
4e98e3785a Reset play attribute on callback plugins when a play fails. 2014-07-01 17:02:10 -04:00
Chris Church
30fae95efe Change variable from pattern to name to correctly indicate what is being passed to the callback. 2014-07-01 17:02:09 -04:00
James Cammarata
8ed6350e65 When parsing json from untrusted sources, remove templating tags 2014-07-01 14:14:14 -05:00
James Cammarata
eeb597360e Further safe_eval fixes 2014-07-01 14:14:14 -05:00
dewey hylton
379e1a49cb fix swap translation on 4.x openbsd with 2.5.4 python 2014-06-30 17:23:55 -04:00
Michael Scherer
f0a7139290 Fix exec_command prototype for the plugin 2014-06-28 13:06:40 +02:00
mesk41in
488aec3936 Fix unsupported regexp parameter in assemble 2014-06-27 13:54:59 +04:00
James Cammarata
539426f612 Performance tuning inventory functions for large inventories 2014-06-26 23:15:39 -05:00
James Cammarata
35368e531b Additional fixes for safe_eval 2014-06-25 21:26:32 -05:00
James Cammarata
5429b85b9f Change safe_eval to a strict white list 2014-06-25 14:00:21 -05:00
James Cammarata
d8a7b49b59 Merge branch 'inventorytree' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-inventorytree 2014-06-24 15:21:08 -05:00
Matt Martz
19f5ce2c9c Allow --vault-password-file to work with a script as well as a flat file 2014-06-24 15:02:24 -05:00
James Cammarata
1adb6dfa05 Remove redundant 'self.user or' added by 0f91add 2014-06-24 10:45:38 -05:00
Thomas Mangin
0f91add86f Explicitly set the user option for ssh connections 
Fixes #7170
 2014-06-23 15:57:49 -05:00
Paul Sokolovsky
f8bf9cdeec Handle TemplateNotFound to render more helpful error message. 
At the point the exception is handled, it is likely due to error loading
a sub-template included from main template. Besides file not found, it
can be caused also by include path failing Jinja2 checks. Now, when
rendering the exception from Jinja, it will include exception name. This
will give basic context or *what* the error is.

Fixes #7103
Fixes #7105
 2014-06-23 15:02:58 -05:00
James Cammarata
5d65c1c4a4 Merge branch 'Mbosco-patch-1' into devel 2014-06-23 13:00:51 -05:00
James Cammarata
6bd0621037 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2014-06-23 12:59:12 -05:00
James Cammarata
1702c2fd50 Merge branch 'patch-1' of https://github.com/Mbosco/ansible into Mbosco-patch-1 2014-06-23 12:57:13 -05:00
James Cammarata
9564818e1e Merge branch 'fix_lineinfile_newlines' into devel 2014-06-23 12:38:12 -05:00
James Cammarata
59c5d6292b Merge pull request #7902 from jirutka/filter-relpath 
Add os relpath filter
 2014-06-23 12:33:30 -05:00
James Cammarata
ce41b02300 Merge pull request #7887 from s0x/funtoo-gathering-facts 
Check for empty os-release file, fixes #7885
 2014-06-23 12:28:32 -05:00
Jakub Jirutka
726a61eb43 Add os relpath filter 2014-06-23 16:10:07 +02:00
Chris Church
6aaad5dc9b Fix missing arg for _remote_chmod method. 2014-06-23 06:09:08 -04:00
Ivo Senner
f4fd9d366b Check for empty os-release file, fixes #7885 2014-06-22 04:08:59 +02:00
Chris Hoffman
cf997beb07 Shell expand DEFAULT_ROLES_PATH fixes #4897 2014-06-20 19:23:46 -04:00
James Cammarata
94963290b9 Merge pull request #6981 from aliles/fix-localhost-executable-with-flags 
Fix localhost tasks with complex executables
 2014-06-20 12:51:54 -05:00
James Cammarata
3c3c710a58 Merge branch 'module_safe_eval' into fix_lineinfile_newlines 2014-06-20 00:16:52 -05:00
James Cammarata
d8bb116c1a Merge branch 'devel' of https://github.com/tgolly/ansible into tgolly-devel 2014-06-19 22:41:58 -05:00
Michael DeHaan
5156794738 Merge pull request #7861 from cchurch/devel 
Windows Remote Support
 2014-06-19 22:10:41 -05:00
Chris Church
615f70e3f4 Fix missing space in script action plugin. 2014-06-19 21:54:21 -05:00
Chris Church
dd3f7c2dab Fix trailing slash on returned temp path. 2014-06-19 16:20:18 -05:00
Chris Church
8a121fd6ae Squeeze a few more bytes out of put_file script. 2014-06-19 16:20:17 -05:00
Chris Church
4e738e6fa9 Optimize buffer size for put_file. 2014-06-19 15:37:42 -05:00
Matt Martz
09dd535296 Make helper functions more robust against undefined powershell objects 2014-06-19 14:26:36 -05:00
Chris Church
43a7a5a990 Collapse extra whitespace in encoded powershell scripts. 2014-06-19 14:25:50 -05:00
Matt Martz
df8866b8bd Add examples for how to use powershell common functions 2014-06-19 14:25:50 -05:00
Matt Martz
e4e610565c Add convenience function (Get-Attr) for getting an attribute/member from a powershell psobject 2014-06-19 14:25:50 -05:00
Matt Martz
90c98ada7c Add ConvertTo-Bool filter function in powershell common code 2014-06-19 14:25:50 -05:00
Chris Church
61c236be9e Fix for creating temp dir with older powershell versions. 2014-06-19 14:25:28 -05:00
Chris Church
243cd877ae Add integration tests for fetch/slurp, make powershell fetch/slurp work as close as possible to existing fetch/slurp modules. 2014-06-19 14:25:28 -05:00
Chris Church
a8ca579761 Fix host parameter to vvvvv. 2014-06-19 14:25:27 -05:00
Matt Martz
97f4f56286 Add Exit-Json and Fail-Json powershell helper functions 2014-06-19 14:24:15 -05:00
Chris Church
74c43c94cf Allow specifying remote powershell version via environment variable. 2014-06-19 14:24:14 -05:00
Chris Church
8f762a7d15 Update logging based on verbosity, add vvvvv support to show details of put/fetch file. 2014-06-19 14:24:14 -05:00
Chris Church
21ba529fbe Fixes/notes related to slashes in remote paths. 2014-06-19 14:24:14 -05:00
Chris Church
7e8cc65829 Refactor common args used for building PowerShell commands. 2014-06-19 14:24:13 -05:00
Matt Martz
e7e95721b9 powershell modules will have a .ps1 extension 2014-06-19 14:24:13 -05:00
Matt Martz
a25c441300 Add shared functions to module_utils/powershell.ps1 and refactor powershell modules to utilize the common powershell code 2014-06-19 14:24:13 -05:00
Michael DeHaan
bafa63b424 Revise documentation on powershell module replacer code. 2014-06-19 14:24:13 -05:00
Chris Church
f7af29680b Add default license boilerplate, refactor common powershell code, fixes for raw/script modules. 2014-06-19 14:24:13 -05:00
Michael DeHaan
35a7c93c76 Added comment about implementation line. 2014-06-19 14:24:13 -05:00
Michael DeHaan
3ac86e57f4 FIXME comment cleanup 2014-06-19 14:24:13 -05:00
Michael DeHaan
80499346d1 Remove stray FIXME 2014-06-19 14:24:13 -05:00
Chris Church
5dcaa30476 Add shell_plugins to abstract shell-specific functions out of runner, add winrm connection plugin, add initial Windows modules. 2014-06-19 14:24:12 -05:00
James Cammarata
360d8b0fc2 Don't try to scan SSH signatures for non-ssh urls 
Fixes #7812
 2014-06-18 14:22:20 -05:00
James Cammarata
2493020d9f Fix get_distribution() for platforms that may have spaces 
The new CentOS 7 beta lists the distribution as "CentOS Linux", which
breaks the distribution detection and class loading. This patch fixes
that by taking just the first entry in the string when a space is
detected.
 2014-06-18 13:10:39 -05:00
James Cammarata
3529b1cb33 Merge branch '7763' of https://github.com/rmarchei/ansible into rmarchei-7763 2014-06-18 12:16:01 -05:00
Michael DeHaan
627ff30a6f Add module replacer capability for powershell files. 2014-06-17 12:30:34 -05:00
Ruggero Marchei
e3f5af377f move get_distribution_version() to basic.py 2014-06-17 10:22:14 +02:00
James Cammarata
cb13b30362 Use file documentation fragement for the copy module 2014-06-16 15:36:15 -05:00
James Cammarata
9b17e8a555 Merge pull request #7771 from jkramarz/issue-5761 
Added missing fallback to hw_sector_size
 2014-06-16 15:15:41 -05:00
James Cammarata
6d9cc64e0f Add role_names to valid keys entry for plays 
Prevents a "not a legal parameter" error for play ds structures that
may be passed into the Play() constructor, which really is mainly a
concern during tests.
 2014-06-16 10:00:43 -05:00
Matt Bray
578e881142 fix for urls like ssh://git@github.com/ansible/ansible.git 2014-06-16 11:58:59 +01:00
Jakub Kramarz
df3188cef0 Added missing fallback from physical_block_size to hw_sector_size in sectorsize fact discovery for kernels older than May 2009. 
References #5761
 2014-06-14 19:42:41 +02:00
James Cammarata
3fb3e7e6dc Properly parse urls for ssh-keyscan use 
Previously, the get_fqdn() function in known_hosts.py only worked
with urls that started with git@, and ignored any urls that started
with a normal schema type (ie. http:// or ssh://). This patch corrects
that by using urlparse to parse the hostname portion out of urls that
have a proper schema.

Fixes #7474
 2014-06-12 16:16:42 -05:00
James Cammarata
395192ffbc Merge pull request #7740 from jkramarz/issue-5761 
changed sector size fact source
 2014-06-12 08:56:03 -05:00
James Cammarata
b4d130d086 Add a new password pattern to the run_command filter 2014-06-12 07:42:25 -05:00
Jakub Kramarz
4e4c9235e8 changed sector size fact source from hw_sector_size to physical_block_size, fixes issue 5761 2014-06-12 12:14:40 +02:00
Stefan Lapers
78f4842982 fix incorrect secondary ip handling, fixes #7724 2014-06-11 09:32:35 +02:00
Eri Bastos
a65fd06338 Added quotes around key path - Issue 7713 2014-06-10 16:39:47 -03:00
James Cammarata
e5ef0eca03 Merge pull request #6507 from brdo/patch-1 
Set keepalive to 5 seconds in paramiko_ssh.py
 2014-06-09 23:44:06 -05:00
smoothify
e3530dcbc2 Add environmentfilter to random filter, to ensure the result doesn't get cached. Mirrors default jinja filter. 2014-06-09 18:52:39 +01:00
Dag Wieers
fd6f0cb4b4 Update facts.py 2014-06-05 15:09:43 +02:00
Dag Wieers
14a9966984 Added cross-platform uptime fact 
Having an uptime fact allows you to check after a reboot whether the system was effectively rebooted.

```yaml
  - name: Safeguard - Was system properly rebooted ?
    action: fail msg="System was not properly rebooted"
    when: ansible_uptime > 900
```

This patch has been tested on Linux, Solaris and HP-UX.
 2014-06-05 11:58:00 +02:00
James Cammarata
ad97c618cf Add support for relative paths in the file lookup plugin for roles 
Fixes #7628
 2014-06-04 15:20:59 -05:00
James Cammarata
82a784931e Fix error passing play vars to an included playbook with empty vars 
Fixes #7658
 2014-06-04 13:22:50 -05:00
James Cammarata
d9df607972 Fix order of merging variables for the combined cache 
Fixes #7598
 2014-06-04 10:50:41 -05:00
James Cammarata
74f20ebf79 Removing cruft leftover from the deprecation of include+with_items 
Also cleaning up integration tests that had checks for the empty item
attribute in certain results.

Fixes #7535
 2014-06-03 13:33:26 -05:00
James Cammarata
0fa5100a2c Merge branch 'fix-7596' of https://github.com/kilburn/ansible into kilburn-fix-7596 2014-06-03 10:26:25 -05:00
James Cammarata
849b0f87ce Fix error when using os.getlogin() without a tty 2014-06-03 09:36:19 -05:00
Brian Coca
ce8c8ab146 now unique actually works, all operations also now use it to return 
unique lists.
 2014-06-01 16:32:48 -04:00
Michael DeHaan
959af67fe3 Merge pull request #7608 from jjneely/lookup-function 
template.py: Handle purposely raised exceptions in lookup()
 2014-05-30 22:24:53 -04:00
James Cammarata
b94bde9711 Merge pull request #7609 from jimi-c/issue_7553_su_copy 
Support checking for su user to atomic_move
 2014-05-30 15:46:34 -05:00
Jack Neely
2fda9bc743 template.py: Handle purposely raised exceptions in lookup() 
If a lookup plugin is run by the lookup() template method it should pass
along any AnsibleError (or child exception classes) rather than just eat
them.  These exceptions are purposely raised by the plugin.
 2014-05-30 16:41:20 -04:00
Marc Pujol
d0f82e94e8 Ensure there are no duplicates in the merged/intersected lists 2014-05-30 15:47:18 +02:00
Marc Pujol
f892cc798c Merge and intersect lists without using sets. 
Using sets for these operations is dangerous because sets cannot contain
certain object types (such as lists) and their iteration order is
undefined.

Fixes #7596
 2014-05-30 09:07:57 +02:00
James Cammarata
188ab7b952 Check groupnames for None as well as an empty string in add_host 
Fixes #7585
 2014-05-29 11:01:11 -05:00
James Cammarata
feafc4cd8a Merge branch 'fix_mutable_inventory_vars' of https://github.com/banterchat/ansible into banterchat-fix_mutable_inventory_vars 2014-05-27 22:09:25 -05:00
Isao Jonas
72524e1f3b dont mutate inventory vars 2014-05-27 19:07:58 -05:00
James Cammarata
061911c9c2 Merge pull request #7558 from dermute/pkg_mgr 
added solaris fact detection for ansible_pkg_mgr
 2014-05-27 16:23:31 -05:00
James Cammarata
e99df21647 Support checking for su user to atomic_move 
Fixes #7553
 2014-05-27 16:04:02 -05:00
James Cammarata
fa86eef9f9 Make sure value in regex_replace is a string 
Fixes #7551
 2014-05-27 14:30:12 -05:00
James Cammarata
ca734fde8b Merge pull request #7544 from rik2803/patch-2 
Differentiate machinfo output key/val separator
 2014-05-27 13:53:12 -05:00
James Cammarata
cfd8c685d1 Correct issue of handlers running on all hosts incorrectly 
Also adds an integration test to catch this bug in the future.

Fixes #7559
 2014-05-27 12:03:08 -05:00
Alexander Winkler
4980e76a3a added solaris fact detection for ansible_pkg_mgr 2014-05-27 06:40:47 +00:00
Brian Coca
8f58ae3305 changed exception handling for hashable test 2014-05-26 08:52:57 -04:00
rik2803
cfcbc954f5 Differentiate machinfo output key/val separator 
get_hw_facts for HP-UX: machinfo in HP-UX B.11.23 uses '=' as separator between key and value, while B.11.31 uses ':'.
 2014-05-26 07:56:46 +02:00
Yang Liping
aedf134fc4 Fix portability issue when checking local facts file permission. 2014-05-26 10:55:32 +08:00
James Cammarata
92f16b3d6f Merge pull request #7539 from jimi-c/issue_7503_freebsd_su_fixes 
Fixes for su on freebsd
 2014-05-25 15:09:58 -05:00
Brian Coca
0dce5dae26 set theory v2, now can handle non hashable items like dicts 2014-05-25 13:20:55 -04:00
James Cammarata
e0c4c51c1f Merge pull request #7517 from amenonsen/double-error 
Don't double (or triple) up common error messages
 2014-05-23 14:06:12 -05:00
James Cammarata
d77a6965b3 Merge module_vars into inject during template instead of updating 
This way we won't overwrite values that are stored in the inject
with module_vars that should be lower precedence.

Fixes #7510
 2014-05-23 13:36:45 -05:00
Abhijit Menon-Sen
f6792b724a Don't double (or triple) up common error messages 
process_common_errors() was called thrice, each time appending to the
existing error message, and leading to confusing repetition in the
message that was finally displayed.

Fixes #7498
 2014-05-23 21:05:42 +05:30
James Cammarata
1e672a0fec Fixes for su on freebsd 
Addresses multiple issues when using su on freebsd including
* su prompt differs between platforms, so turned that check into a
  regex comparison instead of a simple string comparison
* not using '-c' after su causes problems, so added that for all
  platforms
* fixed quoting issues due to multiple uses of '-c' introduced by
  the above fix

Fixes #7503
Fixes #7507
 2014-05-23 10:06:09 -05:00
James Cammarata
32628eef85 Merge pull request #7481 from jimi-c/issue_7396_env_lookup 
Don't use listify_ function, when all we want to do is template variable...
 2014-05-21 15:02:35 -05:00
WAKAYAMA shirou
56880b76bb fix UnicodeEncode error when using pause module with unicode prompt. 2014-05-22 00:21:14 +09:00
WAKAYAMA shirou
346bb611c7 fix UnicodeEncodeError when prompt is unicode. 2014-05-21 23:43:19 +09:00
James Cammarata
e36a8d466e Don't re-query inventory when trimming failed/dark hosts 
Since the filter list contains hosts, passing that back to list_hosts()
in the inventoy causes issues when the hostname is an IPv6 address
(with :'s interpreted as group unions). Since we already have the list
of hosts, we should not need to pass that back through inventory a
second time.

Fixes #7446
 2014-05-20 14:58:37 -05:00
James Cammarata
365bfd732e Don't use listify_ function, when all we want to do is template variables 
This was causing a bug in the env module, due to the fact that we now
pass variables for the module through the templating engine combined
with the fact that we split-up the hostvars and setup variables. As a
result, if a variable in the env lookup had the same name as the variable
in Ansible, it would try and template itself over and over again until
the recursion limit would be hit, at which time an empty string was
returned.

Fixes #7396
 2014-05-20 13:39:23 -05:00
James Cammarata
0ac74aaf59 Also set the environment variables when resetting the locale to C 2014-05-19 23:22:46 -05:00
James Cammarata
1f0be3753d Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions 
Fix skip dir inventory extensions
 2014-05-19 23:14:22 -05:00
James Cammarata
d44ed533b3 Default use_proxy to True for fetch_url() 
Also added some error handling to the fetch_url() call in the
apt_repository module, so that failures to look up the PPA info
are properly handled.

Fixes #7322
 2014-05-19 23:04:13 -05:00
James Cammarata
08406c0ee2 Adding the capability to proxy the ssl cert check 
The ssl cert check will now respect the http and https proxy
environment settings. The url may also have the username/password
embedded, in which case basic auth will be used to connect to the
proxy server.

Fixes #7413
 2014-05-19 16:00:32 -05:00
Matt Martz
0e953c2863 Add run_once task key 
This caused the task to act like  bypass host loop plugin and
execute only on a single host. Can be used with delegate_to
 2014-05-19 12:33:47 -05:00
James Cammarata
285d9878ae Reset locale to 'C' if the specified one is invalid 
Fixes #7448
 2014-05-19 10:26:06 -05:00
Kevin Bell
92bd755b47 Fixed extension filtering in InventoryDirectory 2014-05-14 23:43:14 -07:00
James Cammarata
df877f2e79 Check module_path permissions when creating ssh_wrapper for git 
If the module directory is not writable/executable to the current user
(most likely because of a sudo to a non-root user), the ssh_wrapper
will be created in the default location for mkstemp() calls. To facilitate
the deletion of these new files, a new mechanism for cleaning up files
created by the module was also added.

Fixes #7375
 2014-05-14 21:22:22 -05:00
Michael DeHaan
3b8a35d65e Merge pull request #7406 from specnazzz/fix-python24 
Fix known_hosts.py to work on older versions of python
 2014-05-14 18:31:27 -04:00
James Cammarata
79731ce491 Evaluate changed_when only if task is not skipped 
Fixes #7405
 2014-05-14 16:04:37 -05:00
Michal Mach
60451c20ab Fix known_hosts.py to work on older versions of python 2014-05-14 22:36:32 +02:00
James Cammarata
7faecd54b0 Merge pull request #7388 from jimi-c/issue_7384_vars_files_include 
Pass vars_files on to included playbooks too
 2014-05-14 14:52:33 -05:00
James Cammarata
a9311a5dcb Merge branch 'file_new_dirs_perms' of https://github.com/bcoca/ansible into bcoca-file_new_dirs_perms 2014-05-14 13:53:08 -05:00
James Cammarata
56515a38d5 Only chown on atomic move if the uid/gid don't match the src/tmp file 
This is a corner case for remote file systems that don't support
chown() and where the source and destination for the atomic_move
are on that remote file system.

Fixes #7372
 2014-05-14 09:59:12 -05:00
James Cammarata
525e7339ed Merge branch 'pass-basedir-to-runner-on-setup' of https://github.com/ByteInternet/ansible into ByteInternet-pass-basedir-to-runner-on-setup 2014-05-14 09:46:47 -05:00
James Cammarata
85bd6810bb Pass vars_files on to included playbooks too 
Fixes #7384
 2014-05-14 08:37:47 -05:00
Allard Hoeve
c5833f9869 Add missing basedir to Runner in _do_setup_step 2014-05-14 15:22:02 +02:00
James Cammarata
360ffc4dfd Properly merge role conditionals in with pre-existing conditionals 
Fixes #7387
 2014-05-14 01:45:35 -05:00
James Cammarata
187619c7fe Use utils.combine_vars on vars_files data 
Fixes #7345
 2014-05-13 11:24:41 -05:00
James Cammarata
809b931640 Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir 
Do not base synchronize source on the inventory directory
 2014-05-13 11:05:19 -05:00
Marco Re
712f4a631c Update ssh.py 
Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
 2014-05-13 11:29:19 +02:00
Chris Church
d725636469 Correctly initialize combined_cache for hosts if setup is skipped 
Fixes #7364
 2014-05-12 13:48:11 -05:00
James Cammarata
38c2c60849 Do not base synchronize source on the inventory directory 
Fixes #7366
 2014-05-12 12:02:38 -05:00
James Cammarata
fd27afdc0d Adding ansible_shell_type and basic environment construction on it 
Previously we assumed the shell on the target systems were 'sh'-
compliant when formatting environment variables preceding command
strings. This patch corrects that by basing the target shell type
on the DEFAULT_EXECUTABLE setting, which can be overridden on a
per-host basis using the inventory variable 'ansible_shell_type'.

Fixes #7352
 2014-05-09 16:29:56 -05:00
James Cammarata
9b9b4d50fe Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False 
Fix #7057 missing False default for vars_prompt
 2014-05-09 00:29:31 -05:00
James Cammarata
51ef28b0d2 Merge branch 'warn_wrong_sudo_password' of https://github.com/tyll/ansible into tyll-warn_wrong_sudo_password 2014-05-08 14:16:58 -05:00
James Cammarata
2e2e5d5321 Use the existing module_vars during the templating of module_vars 
Since some of the vars contained in there may be used in the templating
of other variables. This also reverts e83a494 which originally fixed
issue #6979 but broke some other variable related things.

Fixes #6979
Fixes #7321
Fixes #7332
 2014-05-08 13:09:36 -05:00
James Cammarata
77a47dbb2d Merge pull request #7304 from jimi-c/issue_7296_synchronize_relative_path 
Make sure dwim'd relative path ends in a "/" if the original does
 2014-05-07 12:58:04 -05:00
James Cammarata
393124e462 Add pyc/pyo to ignore list for inventory directories 
Fixes #7308
 2014-05-07 09:59:13 -05:00
Brian Coca
8a84b22d76 bumped to 1.7 2014-05-06 23:43:07 -04:00
Chris Church
f9c74d6e57 Add integration tests for group_by module. Fixed bug introduced by ansible/ansible#7273 while also fixing issue described in ansible/ansible#6953 2014-05-06 22:30:37 -04:00
James Cammarata
4d118d1c72 Make sure dwim'd relative path ends in a "/" if the original does 
Fixes #7296
 2014-05-06 13:54:41 -05:00
James Cammarata
56d070afa8 Version bump for 1.7 2014-05-05 16:37:46 -05:00
James Cammarata
fd03cc04e6 Merge branch 'devel' of https://github.com/denisphillips/ansible into denisphillips-devel 2014-05-05 09:22:01 -05:00
Veeti Paananen
d6f4d9b76d Fix error handling on missing dest with unarchive 
fixes #7107
 2014-05-04 18:22:00 +03:00
Denis Phillips
cd0134d290 Used module_args passed to function instead of from runner 2014-05-04 08:49:12 -04:00
Christian Berendt
6676720ce5 fixed typos found by RETF rules in PY files 
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
 2014-05-03 18:40:05 +02:00
James Cammarata
deb532c367 Remove OrderedDict references from runner 
Fixes #7256
 2014-05-02 12:52:36 -05:00
James Cammarata
54b1f820fb Modify the way we set the localization environment 
Previously, we set the LANG (and LC_CTYPE) environment variables
directly in the module code and applied them with os.environ().
Instead, we are now pre-pending those variables to the environment
string used to execute the command which allows the user to
override the localization values by setting the environment values
directly (even on a per-task basis):

  - subversion: repo=file:///path/to/repos/svn_über dest=/tmp/svntest
    environment:
      LANG: "C"
      LC_CTYPE: "en_US.UTF-8"

So if a user wishes to default their LANG back to C, they can still
avoid unicode issues by doing the above.

Fixes #7060
 2014-05-01 10:34:53 -05:00
James Cammarata
40a7a306f5 Merge pull request #7236 from jcassee/robust-ssl-cert-concat 
Make concatenating certs robust in urls.py
 2014-04-30 15:48:13 -05:00
James Cammarata
8e45fa9b63 Moving display-related functions to new module in utils 2014-04-30 15:33:46 -05:00
Joost Cassee
978e6d2cd6 Make concatenating certs robust in urls.py 
Add a newline after each certificate file explicitly to avoid problems
with files that do not end with a newline themselves.
 2014-04-30 21:46:37 +02:00
James Cammarata
6069ff6e9e Adding a new system_warnings config option to supress warnings 2014-04-30 14:44:10 -05:00
James Cammarata
30e4759055 Merge pull request #7208 from jf/copy-module 
Fix "no_log=True" option for copy module (fixes #7193)
 2014-04-29 16:11:23 -05:00
James Cammarata
be4e6d359f Merge branch 'delegate_to_honor_ssh_private_key_file' of https://github.com/renard/ansible into renard-delegate_to_honor_ssh_private_key_file 2014-04-29 15:05:09 -05:00
James Cammarata
4cadcccc48 Catch pycrypto warning about gmp and show a nice warning on stderr 2014-04-29 14:28:14 -05:00
Jeffrey 'jf' Lim
0bf1a27393 Fix "no_log=True" option for copy module (fixes #7193) 2014-04-30 02:24:16 +08:00
Jiri Barton
9da06274a8 Set proper file permisions when a file is created with atomic_move 
Fixes #7196
 2014-04-29 08:41:22 -05:00
Michael DeHaan
9a6998aa17 While this code is unused, this remote module copy of this function should not be carried around in the source code. 2014-04-29 08:12:11 -04:00
Logos01
424ee36e05 Enable facts module on older SuSE systems 
Modified logic of distribution_release for SuSE to retain the last discovered key/value pair's value in /etc/SuSE-release that contains a '=' character.
 2014-04-28 14:37:23 -07:00
James Cammarata
1576e8d611 Adding missing options to the file documentation fragment 2014-04-28 15:31:24 -05:00
Brian Coca
c5d5481ebb added doc noting the change in behaviour 2014-04-27 09:37:44 -04:00
Cédric RICARD
b8b0865ec0 Missing 'base64' import 2014-04-25 00:11:27 +02:00
Michael DeHaan
ad04b455d3 add missing license header 2014-04-24 10:31:04 -04:00
James Cammarata
117952cf6c Fixing a bug in the new fetch_url username/password logic 2014-04-24 00:44:39 -05:00
James Cammarata
b9d8b3b911 Merge pull request #7132 from jimi-c/issue_6601_hide_vault_yaml 
Hide YAML content on syntax errors when a vault password is specified
 2014-04-24 00:28:12 -05:00
James Cammarata
89fa9b7305 Add parameters to get_url for the url username/password 
Fixes #6928
 2014-04-24 00:26:50 -05:00
James Cammarata
e9d8f0639f Merge pull request #7143 from sivel/ansible-sudo-from-root-fix 
Allow sudo to another user from root with the ansible command
 2014-04-23 21:11:39 -05:00
James Cammarata
460794d697 Merge pull request #7140 from jimi-c/issue_6962_traceback_callbacks_unicode 
Fix handling of non-JSON lines in responses
 2014-04-23 19:53:42 -05:00
Matt Martz
eb8759176f Allow sudo to another user from root 2014-04-23 16:14:48 -05:00
James Cammarata
5e598c5337 Fix handling of non-JSON lines in responses 
Garbage lines with ' = ' in them were causing parsing errors,
where key=val lines should not have spaces around the equals.

Fixes #6962
 2014-04-23 15:17:31 -05:00
James Cammarata
38b49476f8 Merge branch 'raw-script-su-support' of https://github.com/sivel/ansible into sivel-raw-script-su-support 2014-04-23 10:02:13 -05:00
James Cammarata
93b5769d94 Hide YAML content on syntax errors when a vault password is specified 
Fixes #6601
 2014-04-23 09:23:07 -05:00
Michael Scherer
0f0f5ff1ce Give more information when a task is empty 
I made a typo in a playbook and was great by:

    ERROR: expecting dict; got: None

The issue was a single - on the last line of a playbook.
With the name of the file, I was able to see right away where the
error was.
 2014-04-23 13:13:46 +02:00
James Cammarata
e83a494e41 Make sure VARS_CACHE for hosts are updated with the play vars too 
Fixes #6979
 2014-04-22 14:42:43 -05:00
James Cammarata
a6068b09ac Fix collision in random filter name by merging functionality 
Merges the functionality of the original jinja2 random filter with
the one we provide.

Fixes #7113
 2014-04-22 14:21:00 -05:00
James Cammarata
c115c34a1f Set the default LANG to en_US.UTF-8 and also set LC_CTYPE 
Fixes #6737
 2014-04-22 00:48:32 -05:00
Brian Coca
c3e559b914 should now work with versions older than 8.4 2014-04-21 21:00:58 -04:00
faust64
78b9a11ccf Update facts.py 
Fixes #7093 --devel
 2014-04-21 19:44:47 +02:00
James Cammarata
68c30548e0 Properly catch and decode unicode strings in module _log_invocation() 
Fixes #7084
 2014-04-21 11:33:23 -05:00
James Cammarata
4f673b9497 Merge pull request #7083 from mscherer/better_message_multiple_action 
Improve error message when multiple action are given
 2014-04-21 10:53:55 -05:00
James Cammarata
39c6141b4a Merge pull request #7082 from bcoca/freebsd_mtu_fix 
fixed issue with FreeBSD network facts
 2014-04-21 10:53:22 -05:00
James Cammarata
086b877719 Merge pull request #7079 from mscherer/fix_error_whitespace_in_config 
Clean a bit more the ssh_args configuration
 2014-04-21 10:43:31 -05:00
James Cammarata
54f86099e4 Merge pull request #7078 from mscherer/fix_error_message_controlpersist 
Enhance error message about missing ControlPersist
 2014-04-21 10:41:58 -05:00
Michael Scherer
1e34e95ba0 Improve error message when multiple action are given 
This can be illustrated using this playbook:

    - command: id
      delegate_to: "{{ remote_server }}"
      user: "{{ remote_user }}"

The error is to use 'user' instead of 'remote_user', but the error message
do not really mention it, so it can be a bit hard to spot.
 2014-04-20 20:32:33 +02:00
Brian Coca
e5f297697a ifconfig changed on FreeBSD, tested this on 8,9 and 10 latest stable 
versions and it now works
 2014-04-19 22:03:30 -04:00
Brian Coca
bc23926f42 fixed ETIME issue on FreeBSD 8 through 10, which broke all fact 
gathering
 2014-04-19 21:42:56 -04:00
Michael Scherer
c87afc1109 Clean a bit more the ssh_args configuration 
If someone add ssh_args = " " to his .ansible.cfg, it will result into
strange failure later :

    <server.example.org> ESTABLISH CONNECTION FOR USER: misc
    <server.example.org> REMOTE_MODULE ping
    <server.example.org> EXEC ['ssh', '-C', '-tt', '-q', ' ', '-o', 'KbdInteractiveAuthentication=no',
    '-o', 'PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey', '-o', 'PasswordAuthentication=no',
    '-o', 'ConnectTimeout=10', 'server.example.org', "/bin/sh -c 'mkdir -p /tmp/ansible-tmp-1397947711.21-5932460998838
    && chmod a+rx /tmp/ansible-tmp-1397947711.21-5932460998838 && echo /tmp/ansible-tmp-1397947711.21-5932460998838'"]
    server.example.org | FAILED => SSH encountered an unknown error during the connection. We recommend you re-run the
    command using -vvvv, which will enable SSH debugging output to help diagnose the issue

The root cause is the empty string between -q and -o, who kinda break mkdir.
 2014-04-20 00:47:00 +02:00
Michael Scherer
3a09c99811 Enhance error message about missing ControlPersist 
ansible_ssh_args is good for playbook, but in the ~/.ansible.cfg
file, it should be ssh_args in a specific section.
 2014-04-20 00:35:10 +02:00
James Cammarata
ae29e43f93 Merge branch 'issue_7009_nfs_selinux' into devel 2014-04-18 22:21:03 -05:00
James Cammarata
a32dd34359 Make sure HostVars object is instantiated before assigning it 
Fixes #7006
 2014-04-18 16:23:01 -05:00
Jim Kleckner
46ec238613 Fix #7057 missing False default for vars_prompt 
The test for default should be "is not None" since a boolean value of
False is a valid value.

See discussion at:
  https://groups.google.com/forum/#!topic/ansible-project/oc1_zE-FnyI
 2014-04-18 12:04:11 -07:00
James Cammarata
75e0b7a5cf Make sure umask is set restrictively before creating any vault files 2014-04-18 13:38:59 -05:00
James Cammarata
3715482d7c Determine selinux context for NFS mount points correctly 
Fixes #7009
 2014-04-18 09:39:58 -05:00
Sébastien Gross
22d6572270 Honor ansible_private_key_file for delegated hosts 
If a delegated host is not found in the inventory specified
private_key_file for primary host was not used.

This allows running playbooks without having to define any inventory at
all and to use the same ssh private key for both primary host and
delegated one.
 2014-04-18 01:48:02 +02:00
Wim
6ed4ca97a8 hint to install python-ssl on redhat systems 2014-04-18 00:07:07 +02:00
smoothify
48bf7a000d Try to pass in item to on_skippped callback. 2014-04-16 15:40:07 +01:00
James Cammarata
d240d073eb Changing SSL cert detection method to allow for auto-negotiation of SSL protocols 
Fixes #6904
 2014-04-15 13:45:21 -05:00
James Cammarata
23c5f4524d Make sure args in run_command are encoded for shlex.split calls on py2.6 2014-04-15 13:04:41 -04:00
James Cammarata
d494a163f9 Merge pull request #6900 from jimi-c/issue_6891_cifs_mount_hang 
Add a timeout decorator for timing out functions that may hang
 2014-04-15 11:21:29 -05:00
James Cammarata
ba1a6c2e11 Removing .orig file merged in accidentally 2014-04-15 10:58:53 -05:00
James Tanner
aad128bac7 Use combined cache for templating module vars 
Fixes #6901
 2014-04-15 10:56:48 -05:00
James Cammarata
40b958e348 Don't turn complex args back into a k=v string for the synchronize module 
Fixes #6951
 2014-04-14 16:35:16 -05:00
James Cammarata
2cc4ac2e75 Catch traceback caused by permissions errors during a local md5 sum 
Fixes #6948
 2014-04-14 12:41:21 -05:00