James Cammarata
1576e8d611
Adding missing options to the file documentation fragment
2014-04-28 15:31:24 -05:00
Christian Berendt
67a8ee24e1
made enabled/disabled checks of apache2_module workable
2014-04-28 19:46:34 +02:00
James Cammarata
50cd3a4a8f
Make sure values are integers for certain hardware items for vpshere_guest
...
Fixes #7180
2014-04-28 11:40:00 -05:00
James Cammarata
a482e1583d
Merge branch 'fix_user_non_root_on_rhel' of https://github.com/mscherer/ansible into mscherer-fix_user_non_root_on_rhel
2014-04-28 10:47:36 -05:00
Michael Scherer
28c373da0c
Do not fail if we try to generate a ssh key for a user without being root
...
If we try to use the user module without being root, it fail on RHEL/Fedora
because usermod --help cannot be run. The root cause is lack of permission
due to EAL4+ certification, as seen in shadow-utils changelo.
So if we cannot run it, assume there is no append. It doesn't matter
much since we will not be able to run usermod at all with or without the
option.
2014-04-28 12:29:57 +02:00
Skyler Leigh Amador
a8d9470938
Remove --timeout option to rsync from synchronize defaults
...
The current 10-second default timeout for rsync seems to be behind issue #6809 .
As a workaround for the underlying issue in rsync when different versions are
used on the source and destination sides, don't include the timeout option
unless the user specifies a timeout > 0.
2014-04-27 20:21:54 -07:00
Michael DeHaan
71a870a6be
Merge pull request #7169 from mjfroehlich/patch-1
...
Small docs edit
2014-04-27 16:30:28 -04:00
Michael DeHaan
2ea386fe04
Merge pull request #7168 from jjshoe/fix_apache2_module_docs
...
Fix example
2014-04-27 16:28:31 -04:00
mjfroehlich
1770ba7380
Update playbooks_delegation.rst
2014-04-27 21:07:09 +02:00
Joel Schuweiler
7916545979
Fix example
2014-04-27 12:16:51 -05:00
Joel Schuweiler
5bad971873
Finish reverting #b73cddc
2014-04-27 09:36:13 -05:00
jjshoe
a34478d6f3
Ensure the validation string has %s in it
2014-04-27 09:30:36 -05:00
James Cammarata
f2db460203
A few updates to the ec2_elb_lb integration test
2014-04-25 14:49:00 -05:00
James Martin
2ef65ae813
ec2_elb_lb integration tests.
2014-04-25 14:49:00 -05:00
James Cammarata
ccd607be6b
Merge pull request #7160 from mkosmach/devel
...
Please add simplejson as alternative to json in apt_rpm
2014-04-25 09:15:06 -05:00
Brian Brazil
d25f1dc2d0
Use empty string rather than None to avoid TypeError
...
Improve error messages.
2014-04-25 13:30:19 +01:00
mkosmach
fbf3b78ace
add simplejson as alternative to json
2014-04-25 02:44:51 -07:00
Michael DeHaan
6592511e6e
Merge pull request #7156 from ricard33/patch-2
...
Missing 'base64' import
2014-04-25 00:37:23 -04:00
Ben Holloway
e45d33954b
documentation fix
2014-04-24 17:58:39 -06:00
Ben Holloway
4596521147
attempt to set availability_zones to all if neither availability_zones or vpc_identifier are set
2014-04-24 17:56:26 -06:00
Cédric RICARD
b8b0865ec0
Missing 'base64' import
2014-04-25 00:11:27 +02:00
Bruce Pennypacker
dc912ca201
removed unwanted 'if wait else None'
2014-04-24 20:41:51 +00:00
James Cammarata
b8816bf66f
Merge pull request #7153 from budlight/patch-1
...
Added instance_type to ec2_lc variable list
2014-04-24 14:03:19 -05:00
James Cammarata
e241e2d310
Merge branch 'integration_test_eip' of https://github.com/jsmartin/ansible into jsmartin-integration_test_eip
2014-04-24 13:05:21 -05:00
Ben
5a39672efa
documentation fix availability_zones should be required for ec2_asg
2014-04-24 11:56:25 -06:00
Ben
30b634eae9
updated example to include instance_type
2014-04-24 11:50:49 -06:00
Ben
9770c7f47d
Added instance_type to ec2_lc variable list
2014-04-24 11:47:41 -06:00
Michael DeHaan
31f7a0693e
Add missing license headers to two modules and standardize formatting of another.
2014-04-24 10:32:54 -04: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
5b635b9e05
Merge pull request #7138 from jimi-c/issue_6928_get_url_password
...
Add parameters to get_url for the url username/password
2014-04-24 00:27:43 -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
3a20291838
Merge branch 'andreasf-apt_key_format' into devel
2014-04-24 00:17:01 -05:00
James Cammarata
4209abe6aa
Adding CHANGELOG entries for the new vpshere_guest module
2014-04-24 00:02:18 -05:00
James Cammarata
83f300ddd6
Merge branch 'apt_key_format' of https://github.com/andreasf/ansible into andreasf-apt_key_format
2014-04-24 00:02:10 -05:00
James Cammarata
3f1545f9db
Fixing the version_added string in the vsphere_guest module
2014-04-23 22:46:14 -05:00
James Cammarata
833ceeca24
Merge branch 'vmware_core' of https://github.com/rhoop/ansible into rhoop-vmware_core
2014-04-23 21:12:40 -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
2bc640c82f
Merge pull request #7141 from lamby/devel
...
Correct/update debconf examples - need to specify vtype.
2014-04-23 21:09:52 -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
Michael DeHaan
237b9cb056
Merge pull request #7144 from nickbudi/devel
...
Add note about with_fileglob to "Looping over Fileglobs"
2014-04-23 20:24:32 -04:00
Michael DeHaan
58caeb7e8c
Merge pull request #7145 from npeters/devel
...
Remove invalid variable
2014-04-23 20:22:34 -04:00
npeters
61bb40c0dd
Remove invalid variable
2014-04-24 01:12:55 +02:00
Ben Whaley
1c996085ff
Updated to use fetch_url
2014-04-23 15:26:13 -07:00
Nick Budidharma
337682b6a0
Add note about with_fileglob to "Looping over Fileglobs"
...
Reference #7102
2014-04-23 17:52:32 -04:00
Matt Martz
eb8759176f
Allow sudo to another user from root
2014-04-23 16:14:48 -05:00
James Cammarata
16874464e9
Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check
...
docker: exclude 'entrypoint' from comparing 'command' param with containers
2014-04-23 16:14:48 -05:00
James Cammarata
ef2de97bbb
Changelog updates for docker/abiquo inventory script additions
2014-04-23 16:07:33 -05:00
James Cammarata
442c68f7e8
Merge pull request #7025 from angstwad/docker_inv
...
Add Docker inventory plugin
2014-04-23 16:06:25 -05:00