Commit graph

10603 commits

Author SHA1 Message Date
James Cammarata
67fe23e166 Merge pull request #7524 from aresch/patch-2
Replace CommandException with Exception
2014-05-23 16:14:28 -05:00
Andrew Resch
fb1385bbd9 Replace CommandException with Exception 2014-05-23 12:44:01 -07: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
James Cammarata
4aab832ac4 Merge branch 'evgkrsk-suds' into devel 2014-05-23 11:32:49 -05:00
Evgenii Terechkov
7ad6f6e385 Relax suds module requirement 2014-05-23 10:40:10 -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
871f0378c8 Merge pull request #7085 from danieljaouen/brew
Add `upgrade_all` option to homebrew module.
2014-05-23 10:30:39 -05:00
Daniel Jaouen
37fff3dc38 Add upgrade_all option to homebrew module. 2014-05-23 11:09:18 -04:00
James Cammarata
33053615a7 Merge pull request #7514 from Xerkus/patch-2
Fix typo requird -> required
2014-05-23 08:17:39 -05:00
Aleksey Khudyakov
a67c6f0663 Fix typo requird -> required 2014-05-24 00:10:46 +11:00
Michael DeHaan
ee82681d14 Merge pull request #7501 from sivel/rax-dns-serial-doc
Add notes to rax_dns and rax_dns_record to recommend using serial: 1
2014-05-22 14:10:43 -04:00
Matt Martz
413243186d Add notes to rax_dns and rax_dns_record to recommend using serial: 1 2014-05-22 11:58:28 -05:00
James Cammarata
10414145b2 Merge pull request #7479 from waveaccounting/devel
Update django_manage `command` argument description
2014-05-21 15:47:03 -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
Michael Warkentin
c8eb47eefa Update command description
The docs were a little bit out of date with what commands are available to be run. They also didn't explain that you could pass custom commands - I almost went down the path of trying to run our custom management commands with the generic Ansible `command` module.
2014-05-21 14:00:12 -04:00
James Cammarata
062e82937f Fixing absolute path calculation for file module when linking
Fixes #7403
2014-05-21 12:49:42 -05:00
James Cammarata
981d56ba55 Merge pull request #7472 from atlashealth/ec2_terminate_paused_instances
EC2: stopped instances can also be terminated
2014-05-21 10:27:10 -05:00
James Cammarata
f54a3b6641 Merge branch 'shirou-devel' into devel 2014-05-21 10:24:31 -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
Atlas Health
26c2491583 Stopped instances can also be terminated 2014-05-21 07:18:30 -07:00
James Cammarata
ed7e17210e Merge branch 'asnare-elb-internal' into devel 2014-05-21 08:59:49 -05:00
James Cammarata
7ef94428bf Merge branch 'elb-internal' of https://github.com/asnare/ansible into asnare-elb-internal 2014-05-21 08:34:21 -05:00
James Cammarata
0f402bfb7d Merge branch 'webmat-multi-word-mysql-grant-example' into devel 2014-05-21 07:50:55 -05:00
James Cammarata
4faff30ee0 Merge branch 'multi-word-mysql-grant-example' of https://github.com/webmat/ansible into webmat-multi-word-mysql-grant-example 2014-05-21 07:48:24 -05:00
James Cammarata
9f4f8a3c22 Merge pull request #7470 from bcoca/update_bin
now module searches for update-alternatives vs hardcoding it
2014-05-21 07:44:50 -05:00
Brian Coca
24f5030257 now module searches for update-alternatives vs hardcoding it 2014-05-20 22:51:27 -04:00
Andrew Snare
0cc6c479bc Support internal-only ELBs in EC2. 2014-05-20 22:21:14 +02: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
Mathieu Martin
a8969b5d3c Add example 'Specify grants composed of more than one word' to the mysql_user module. 2014-05-20 14:41:18 -04: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
James Cammarata
285d9878ae Reset locale to 'C' if the specified one is invalid
Fixes #7448
2014-05-19 10:26:06 -05:00
Michael DeHaan
63505cd8b8 Merge pull request #7437 from mrdeathless/patch-1
Add missing space between var and delimeter
2014-05-18 22:38:06 -04:00
mrdeathless
856681a28d Add missing space between var and delimeter 2014-05-17 16:43:23 +03:00
James Cammarata
cbea442ec2 Pull the link out of the alternatives output when not specified
Fixes #7414
2014-05-16 14:44:31 -05:00
James Cammarata
2128949a78 Merge branch 'mpeters-yum_module_typos' into devel 2014-05-16 09:25:42 -05:00
James Cammarata
923baa6772 Merge branch 'yum_module_typos' of https://github.com/mpeters/ansible into mpeters-yum_module_typos 2014-05-16 09:24:47 -05:00
James Cammarata
e3ee7787ed Remove erroneous set of status_code causing a traceback in module uri
Fixes #7416
2014-05-16 08:49:08 -05:00
Michael Peters
15b3b42525 slight language change based on feedback from jimi-c 2014-05-16 09:44:32 -04:00
James Cammarata
a992dc88ba Merge pull request #7428 from alanpearce/patch-1
Update composer example
2014-05-16 08:36:09 -05:00
Michael Peters
69923cc413 fixing some typos in the docs of the yum module 2014-05-16 09:22:12 -04:00
Alan Pearce
670068aaad Update composer example
Remove unsupported 'install' argument
2014-05-16 14:06:55 +01:00
Michael DeHaan
b80b92e778 Stackdriver module was in the wrong category, so moving. 2014-05-16 08:30:38 -04:00
James Cammarata
2e8c940566 Merge pull request #7419 from mattjbray/docker-fix-selection-by-name
docker: fix targetting images by name
2014-05-15 09:55:46 -05:00
Matt Bray
8363ab5a6f docker: fix targetting images by name 2014-05-15 15:04:30 +01:00