Commit graph

6644 commits

Author SHA1 Message Date
James Cammarata
519d195f2a Merge branch 'rax_wait_on_delete' of https://github.com/jlaska/ansible into jlaska-rax_wait_on_delete 2013-09-20 16:22:02 -05:00
James Cammarata
47b9cc6311 Merge branch 'meta-roles' of https://github.com/eggsby/ansible into eggsby-meta-roles
Conflicts:
	lib/ansible/playbook/play.py
2013-09-20 16:17:40 -05:00
James Cammarata
27e8675277 Make the role_name in the task its own field for use in the callback 2013-09-20 15:46:34 -05:00
James Laska
03252e1d30 [cloud/rax] support wait on delete
Add support to existing rax module to honor the wait (and wait_timeout)
parameters on delete operations.  This patch removes existing logic in favor of
the built-in pyrax.utils.wait_until method.
2013-09-20 13:49:39 -04:00
James Cammarata
7272aa0347 Merge branch 'devel' of https://github.com/pieteravonts/ansible into pieteravonts-devel 2013-09-20 12:14:21 -05:00
James Cammarata
98cfcec5e2 Correct role name detection 2013-09-20 12:10:24 -05:00
James Cammarata
8dcf386def Don't set the role name on handlers as this breaks notifications 2013-09-20 09:34:14 -05:00
Pieter Avonts
60d8f92b3c changed deprecated channel_label attribute 2013-09-20 12:58:43 +02:00
James Cammarata
a5ee6ff1e5 Display parent role name of tasks in the name line
Fixes #4076
2013-09-19 20:44:52 -05:00
James Cammarata
c2e02fbd6b Minor tweak to service changed logic from the previous commit 2013-09-19 15:00:25 -05:00
James Cammarata
f62093da56 Merge branch 'service-enable-fix' of https://github.com/gottwald/ansible into gottwald-service-enable-fix 2013-09-19 14:59:53 -05:00
Petr Svoboda
8d290e3394 Fix traceback in service module when svc_cmd is None (2nd fix)
When service module is used on unsupported Linux system where init
script is used directly, LinuxService.svc_cmd is None so .endswith()
fails.

This extends fix from e2f20db534 also
for state=restarted.

Fixes issue #3533
2013-09-19 14:36:02 -05:00
James Cammarata
d89f104e91 Merge pull request #4179 from resmo/fix/doc-apt-repository
Fixed missing required package in notes.
2013-09-19 10:45:54 -07:00
René Moser
ccf4cf1dd8 Fixed missing required package in notes. 2013-09-19 19:34:15 +02:00
James Cammarata
c840cbaad9 Merge branch 'fork_fixes' of https://github.com/akerl/ansible into akerl-fork_fixes 2013-09-19 10:37:45 -05:00
James Cammarata
69cfcf7ed0 Minor change to -vvvv mode to only show debugging info for ssh conns
Also added this feature to the CHANGELOG
2013-09-19 08:12:43 -05:00
James Cammarata
d5b96abd80 Added support for -vvvv to enable ssh connection debugging
This patch also checks specifically for a return code of 255, which
indicates an unknown SSH error of some kind. When that happens, ansible
will now recommend running with -vvvv (if not enabled) or show the
output from 'ssh -vvv' (when it is enabled)
2013-09-19 05:58:54 -05:00
Thomas Omans
91a4ba2248 allowing a roles to do be made out of dependencies alone 2013-09-18 21:29:37 -07:00
James Cammarata
503f062521 Merge branch 'ferringb-fixes/configurable-ControlPath' into devel 2013-09-18 21:12:15 -05:00
James Cammarata
848a966736 Adding example section to ansible.cfg for the control_path setting 2013-09-18 21:10:32 -05:00
Michael DeHaan
20708e31b1 Merge pull request #4133 from skyl/DIST_MODULE_PATH
DEFAULT_MODULE_PATH in setup.py
2013-09-18 18:15:18 -07:00
Michael DeHaan
76fd60dad8 Update CONTRIBUTING.md 2013-09-18 21:14:02 -04:00
James Cammarata
aa64aecbed Merge pull request #4157 from yellottyellott/fix_accelerated_typo
Typo fix from `accelerated: true` to `accelerate: true`
2013-09-18 15:16:55 -07:00
Erick Yellott
af7b182958 Typo fix from accelerated: true to accelerate: true 2013-09-18 16:47:49 -05:00
Brian Harring
5b1b831cc7 Make ssh's ControlPath configurable via ansible.cfg
This shouldn't generally be needed unless you're working in an environment
that uses rediculously long FQDNs; if the name is too long, you wind up
hitting unix domain socket filepath limits enforced by ssh.
2013-09-18 15:07:07 -04:00
James Cammarata
022918e5af Merge branch 'fix/apt_repository_update_cache' of https://github.com/resmo/ansible into resmo-fix/apt_repository_update_cache 2013-09-18 12:40:39 -05:00
James Cammarata
687753e4cb Fixing up some search/replace errors regarding user/remote_user 2013-09-18 12:22:41 -05:00
René Moser
9fccf96d61 apt_repository: added option update_cache.
The default behavior is to update_cache if changed.

If you add more then one repo, you may not want to update cache for every repo separately.
So you can now disable update_cache with this new option e.g. update_cache=no

Updating cache can also be handled using the apt module.
2013-09-18 19:14:08 +02:00
Michael DeHaan
39659db72a Merge pull request #4148 from ralphbean/digital_ocean_cleanup
Cosmetic - Digital ocean cleanup
2013-09-18 08:12:44 -07:00
Ralph Bean
a1ea15141e Remove trailing whitespace in digital ocean module. 2013-09-18 11:06:32 -04:00
Ralph Bean
3eab663f2e Remove duplicate docs in digital ocean module.
The EXAMPLES block here has two copies of the same docs,
one nicely formatted, the other less so.

It looks like a pass was made to clean up the docs but the old
cruftier ones were never removed.
2013-09-18 11:05:06 -04:00
Michael DeHaan
31ec42ef92 Merge pull request #4145 from resmo/fix/zabbix-inventory-stderr
zabbix inventory: print errors to stderr
2013-09-18 05:00:42 -07:00
René Moser
a991b62a51 apt_repository: fix update cache after state=changed. Closes GH-4136 2013-09-18 11:47:39 +02:00
René Moser
269ceada78 zabbix inventory: print errors to stderr 2013-09-18 09:56:30 +02:00
Stephen Fromm
27b5c2e28c Fix how module_common handles selevel (issue #4142)
Two fixes:

* parameter name is selevel, not serange.
* Fix split on selinux context to limit to max of 4 since the selevel
  may contain ':' characters.  This was fixed in
  selinux_default_context() and selinux_context().
2013-09-17 14:47:00 -07:00
James Cammarata
671eeb65b2 Merge pull request #4138 from resmo/fix/redundant-fail-json
apt: fixed duplicate fail_json
2013-09-17 06:08:51 -07:00
Rene Moser
9449d62fb2 apt: fixed duplicate fail_json 2013-09-17 15:05:20 +02:00
Skylar Saveland
50bd14faa9 use DEFAULT_MODULE_PATH in setup.py so that there is a chance to override with ANSIBLE_LIBRARY env variable 2013-09-16 19:08:22 -07:00
Michael DeHaan
d27f6e037e Merge pull request #4135 from shuhaowu/patch-1
Fixed monit restarted error.
2013-09-16 17:00:41 -07:00
Shuhao Wu
0d2a3f1b0c Fixed monit restarted error.
Errors everytime...
2013-09-16 19:14:17 -04:00
Les Aker
98bf473cb2 fixes for PTY handling 2013-09-16 17:44:32 -04:00
James Cammarata
c934d4a383 Added standardized includes to the CHANGELOG 2013-09-16 16:32:32 -05:00
James Cammarata
458f71b53c Merge branch 'issue_4129_role_defaults_empty_yaml' into devel
Conflicts:
	lib/ansible/playbook/play.py
2013-09-16 16:21:06 -05:00
James Cammarata
091a90ee8b Allow includes to follow the standard format
Previously, includes had to receive variables via a special 'vars'
field. With this patch, the include syntax becomes a more natural
datastructure without special fields and is more akin to the way
role includes/dependencies work.

Tested with the following playbook:
---
- hosts: localhost
  connection: local
  tasks:
  - { include: inc1.yml, a: 1 }
  - include: inc2.yml
    b: 2
  - include: inc3.yml
    with_items:
    - x
    - y
    - z

Fixes #3481
2013-09-16 16:12:36 -05:00
Skylar Saveland
8dc31f3093 ANSIBLE_DIST_MODULE_PATH environment variable 2013-09-16 13:43:20 -07:00
James Cammarata
c5bb1394b9 Check to make sure default_vars in the datastructure isn't empty
Fixes #4129
2013-09-16 13:16:06 -05:00
Michael DeHaan
4d352e69fc Update CHANGELOG.md 2013-09-16 10:53:56 -04:00
James Cammarata
f4c5f37ca6 Merge branch 'issue_3417_systemd_stuff' into devel 2013-09-16 09:30:39 -05:00
James Cammarata
5b15010099 Merge branch 'issue_3312_role_links' into devel 2013-09-16 09:29:25 -05:00
James Cammarata
02033f9ec8 Merge branch 'archlinux-fact' of https://github.com/Schnouki/ansible into Schnouki-archlinux-fact 2013-09-16 07:45:38 -05:00