cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6076 commits 47 branches 390 tags 440 MiB
Commit graph

2079 commits

Author SHA1 Message Date
Patrik Lundin
af52cd6ec1 openbsd_pkg: sync package_latest(). 
This diff syncs package_latest() with the changes to package_present().
I have not managed to figure out how to handle the cornercases where
stderr is set but the command has not failed, so leave a FIXME blob for
other adventurers.
 2013-07-10 21:06:35 +02:00
Patrik Lundin
0e4e6e8a84 openbsd_pkg: Handle another pkg_add gotcha 
* Add '-m' to pkg_add incovation to get access to the "packagename-1.0: ok"
  message.
* Watch for that message if we are about to fail because of stderr in
  package_present().
 2013-07-10 18:19:01 +02:00
Darragh O'Reilly
6346798e7e Keystone_user module: fix authentication needs tenant_name too 
The keystone client needs to be passed tenant_name when authenticating the
user/password way. Also it needs auth_url instead of endpoint.
This fix adds login_tenant_name as a module parameter which is consistent
with the other OpenStack modules.
 2013-07-10 07:21:07 +01:00
Patrik Lundin
a67ea75dec openbsd_pkg: handle pkg_add quirks better. 
This fixes a problem when trying to install a package with a specific version
number from a local directory and the local directory is checked after a remote
repository:

Error from http://ftp.eu.openbsd.org/pub/OpenBSD/[...]/packagename-1.0.tgz
ftp: Error retrieving file: 404 Not Found
packagename-1.0: ok
 2013-07-09 20:56:22 +02:00
Frank Shearar
9ba4a42ff8 Minor typo 2013-07-09 17:33:30 +01:00
Frank Shearar
ec78daa456 Let someone specify a path to a Rabbit that's not installed in the usual place. 2013-07-09 17:33:14 +01:00
Felix Stuermer
b5df29901f Use the force=yes option for apt upgrade actions 2013-07-09 10:57:19 +02:00
Patrick Callahan
8f14ffe56b Bug fixes and enhancements. 
Bugs:
(1) no longer allow empty jobs
(2) strip the header added by crontab package used in openSuSE and SuSE
(3) try not to leak temp files when things go wrong
(4) issue returning job names under certain conditions

Enhancements:
(1) Allow all special times not just reboot.
(2) Fail earlier by performing more input validation
(3) Add feature to allow removing cron file under /etc/cron.d

ToDo:
(1) Validate times (minute, hour, ...)
(2) Strip white space from fields such as name and job such that name=foo equals name=' foo'.
(3) More testing
 2013-07-09 03:21:40 +00:00
Jesse Keating
1689001036 Update fail docs for new syntax 
Use when instead of only_if
Use new variable style
 2013-07-08 14:22:05 -07:00
Brian Coca
0664e36aa2 fixed check mode 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-07-08 15:41:39 -04:00
Evan Duffield
7932ccef46 added note about AMI security 2013-07-08 10:24:22 -07:00
Evan Duffield
e33f5ae56e Merge branch 'devel' of https://github.com/evan82/ansible into devel 2013-07-08 09:26:04 -07:00
Evan Duffield
45bdda24db added region to spec 2013-07-08 09:24:18 -07:00
Casper Langemeijer
922a71fced Only append non_unique parameter if a uid is provided as well 2013-07-08 11:46:38 +02:00
Cristobal Rosa
51166c9cfa Remove unnecesary call 2013-07-06 22:12:30 +02:00
James Martin
93d5d76468 Fixed #3433. Using get_bin_path, removed uneeded imports, "module" is inlined, misc other style improvements. 2013-07-05 13:22:44 -04:00
Michael DeHaan
4dfbbc4499 Revert "ini_file: add support for lists of options/values" 
Breaks "," values in INI files

This reverts commit af051d6f77.
 2013-07-05 12:04:07 -04:00
Cristobal Rosa
cf48141a33 Fixed monit module. Ignore uppercase letters 2013-07-05 05:49:07 +02:00
Seth Vidal
d710201ecc - optimize for the extremely common case of people specifying pkg names which are, ultimately, already installed 
on a system here time went from  16s for a series of pkgs to 3s to just
  check that they were installed.
 2013-07-04 17:35:34 -04:00
Evan Wies
cbeb6a63e5 supervisorctl: add command-line options as module parameters 
Adds more parameters which may be passed to supervisorctl:  config,
serverurl, username, password

Also refactored the various `module.run_command(build_a_string)` calls
into a single `run_supervisorctl` function.
 2013-07-04 12:23:16 -04:00
lwade
ae992c6b6e Rewritten s3 module to allow for additional modes of operation. 2013-07-04 15:55:06 +01:00
Matt Spaulding
871f781ec7 Fix git submodule update when version specified 2013-07-03 17:19:14 -07:00
Joshua Lund
caf394c8f6 Fix some minor spelling mistakes in the hg module documentation 2013-07-03 13:23:08 -06:00
Jan-Piet Mens
9a82d8c692 files/stat: add pw_name and md5 sum to stat, and add meaningful? example 
remove unnecessary import,
  md5 sum on regular files only
 2013-07-03 21:07:45 +02:00
Evan
de211aa8ec Getting timeout errors this morning as AMIs are taking a bit longer to create, so I changed to timeout to 15 minutes 2013-07-03 11:10:39 -07:00
Evan
637a6c562e fixed spelling errors, unused variables and unused import 2013-07-03 10:35:32 -07:00
Aaron Brady
efc4bc10d4 Make the CPU facts Hyperthreading aware 2013-07-03 16:25:35 +01:00
trbs
3b2173b6df sleep option for service module which adds a pauze between stopping and starting a service using state=restarted. This helps for bad scripts that exist immediatly after signaling a process to stop. 2013-07-03 17:08:07 +02:00
Antti Rasinen
93fc3391fe Fix service enable on FreeBSD 
Some services have a knob (i.e. rc.conf setting) whose name
differs from that of the script. For example, lockd process
is controlled with a script called lockd, but the rc.conf
value is rpc_lockd_enable.

Fixes issue #3382.
 2013-07-03 14:52:23 +03:00
Evan Duffield
c8f8f14e59 Added module for baking EC2 AMIs 2013-07-02 11:24:40 -07:00
Ben Podoll
1bea4b1709 fixing small mis-spelling 2013-07-01 21:33:25 -05:00
Dmitry Kolobaev
8745de11a6 Update gem 
I've added ability to install gems in system-wide manner with --no-user-install options
 2013-07-01 06:20:46 -07:00
Andrew de Quincey
4cb48f0dcc Check if mysql allows login as root/nopassword before trying supplied credentials. 2013-07-01 11:56:04 +01:00
Jan-Piet Mens
f77c0a44f9 broken docs in files/file module! 
remove obsolete examples: key
 2013-07-01 12:18:07 +02:00
Brian Coca
9f75397310 updated module docs to reflect 'correct' on_create vs on_creation 
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
 2013-06-30 20:32:05 -04:00
Michael DeHaan
6d9949698b Merge pull request #3292 from sfromm/git-submodule 
Add submodule support to git module
 2013-06-30 16:46:19 -07:00
Michael DeHaan
fafb3c10a5 Merge pull request #3293 from jarv/devel 
Adds termination support to the ec2 module
 2013-06-30 16:40:51 -07:00
Michael DeHaan
c9b6f0d0f2 Merge branch 'files_force' of git://github.com/rhaido/ansible into devel 2013-06-30 19:24:37 -04:00
Michael DeHaan
15bf8a8398 Merge pull request #3315 from madduck/fix-service-updatercd-changed 
Let update-rc.d set changed flag properly
 2013-06-30 16:09:39 -07:00
Michael DeHaan
7821473710 Fixup documentation YAML 2013-06-30 19:00:43 -04:00
Michael DeHaan
681696846a Styling: semicolon 2013-06-30 18:56:03 -04:00
Michael DeHaan
ecc2b6e742 Styling: deprecation 2013-06-30 18:55:45 -04:00
Michael DeHaan
2e63faf257 Styling: deprecation 2013-06-30 18:55:03 -04:00
Michael DeHaan
257d827c9e Styling: misc pep8 2013-06-30 18:54:32 -04:00
Michael DeHaan
bc7de7bf3f Styling: indentation 2013-06-30 18:53:55 -04:00
Michael DeHaan
0e51a1c0ea Styling: semicolon 2013-06-30 18:53:22 -04:00
Michael DeHaan
39834d854c Styling: trailing spaces 2013-06-30 18:52:57 -04:00
Michael DeHaan
fc8ffc1864 Styling: blank lines 2013-06-30 18:52:33 -04:00
Michael DeHaan
c7eb68e043 Styling: deprecation 2013-06-30 18:52:17 -04:00
Michael DeHaan
4827d1451e pep8: deprecation 2013-06-30 18:51:47 -04:00
Michael DeHaan
899ea4de82 Styling: indentation 2013-06-30 18:51:11 -04:00
Michael DeHaan
0b251d840b Styling: spacing 2013-06-30 18:51:00 -04:00
Michael DeHaan
ea2a665981 Styling: misc pep8 2013-06-30 18:50:40 -04:00
Michael DeHaan
82d51e6354 Semicolons must die 2013-06-30 18:49:17 -04:00
Michael DeHaan
29894737cf Merge pull request #3374 from jsmartin/bugfix 
cloudformation: Fixed bug in module_fail. Consistent error handling.
 2013-06-30 15:22:25 -07:00
Michael DeHaan
213e74a44c Merge pull request #3298 from devo-ps/linode 
Add Linode cloud support.
 2013-06-30 14:22:07 -07:00
Michael DeHaan
fa4313c7ee Merge pull request #3358 from aristanetworks/devel 
initial arista module import
 2013-06-30 14:17:47 -07:00
Michael DeHaan
a501e94b63 Merge pull request #3364 from sergevanginderachter/lvol 
lvol module: add support for multiple size formats
 2013-06-30 14:15:55 -07:00
James Martin
7b825f72df Fixed bug in module_fail. Consistent error handling. Adding comments. Removal of unused variable. Removed unecessary wait_for option. was never been used to begin with. Trim down the stack_outputs. Don't need to include stack name and region since they are already required parameters. Rollback supported in status operations. Using dict when possible. 2013-06-30 16:59:50 -04:00
Michael DeHaan
6d5ac43dcb Merge pull request #3368 from j2sol/wait_for_improv 
Improvements to wait_for module
 2013-06-30 09:20:12 -07:00
Michael DeHaan
88c907af90 Merge pull request #3340 from bpennypacker/stat 
get file/path facts via 'stat'
 2013-06-30 09:19:06 -07:00
Michael DeHaan
71b9be509c Merge pull request #3347 from AscendLearning/irc-with-pass 
Added a provision for passing a server password to IRC
 2013-06-30 09:17:19 -07:00
Michael DeHaan
a8e8a9583b Merge pull request #3336 from lorin/htpasswd 
Add htpasswd module
 2013-06-30 09:15:50 -07:00
serenecloud
a17ca862fb Return a friendly error message if aptitude isn't installed 2013-06-30 15:36:13 +12:00
Peter Sprygada
037a6d497b moved modules to net_infrastructure 2013-06-29 19:59:14 -04:00
Jack Kuan
a07324c590 Fix the issue of easy_install ignoring virtualenv_site_packages=yes. 2013-06-29 17:03:12 -04:00
Michael DeHaan
467f612ef6 Merge pull request #3367 from rstrox/devel 
Include identity_type required by Pyrax 1.4
 2013-06-27 18:15:31 -07:00
Jesse Keating
d541e68027 Elapsed time should account for the delay 2013-06-27 17:42:33 -07:00
rstrox
e836e5789e Include identity_type required by Pyrax 1.4 2013-06-27 13:50:36 -05:00
Peter Sprygada
eb082e22b8 initial arista module import 2013-06-26 22:59:23 -04:00
Jesse Keating
95326ce41b Remove a trailing quote 2013-06-26 15:09:00 -07:00
Michael DeHaan
0a10727652 Merge pull request #3350 from billwanjohi/devel 
validate files: fix usage error in example tasks
 2013-06-26 13:14:42 -07:00
Michael DeHaan
f3093cbb1a Fixup previous apt_key patch to enable file based modes to work. 2013-06-26 14:46:29 -04:00
billwanjohi
bf56d69df7 validate files: fix usage error in example command 
visudo requires the -f option to check any other file than the default.
I've added this to the example ansible tasks.
 2013-06-26 13:24:15 -05:00
Bruce Pennypacker
c47d121481 don't fail if the file doesn't exist. Just set 'exists' to true/false as appropriate 2013-06-26 12:32:28 -04:00
Kevin Montuori
b86d93adc9 added a provision for passing a server password to IRC 2013-06-26 14:16:59 +00:00
Bruce Pennypacker
59a045e4cb Fixed stat of symlinked dirs 2013-06-25 14:14:18 -04:00
Bruce Pennypacker
19b8de7ede get file/path facts via 'stat' 2013-06-25 11:04:22 -04:00
Lorin Hochstein
f69f364b90 Add GPL header and copyright 2013-06-24 21:18:05 -04:00
Serge van Ginderachter
f000dcd526 add more support for different size formats 2013-06-24 22:37:31 +02:00
Lorin Hochstein
06d92f1103 Add htpasswd module 
Add a new module for managing entries in an htpasswd file, used
for basic authentication with web servers such as Apache and Nginx
 2013-06-24 16:24:55 -04:00
James Laska
4311412b44 Correctly load up2date configuration 
Previously, a configuration file name of None was being passed into
up2dateInitConfig().  This resulted in a correct configuration import,
but failed to properly save the configuration back to disk in the event
a different serverURL was supplied.  This change removes support for
customizing the up2date filename entirely, and relies on up2date to
choose the default config filename.
 2013-06-24 13:00:23 -04:00
Lorin Hochstein
1bcc60992c Doc: rabbitmq_user pw change and force 
Document that need to add force=yes to change password of
existing user
 2013-06-23 11:05:09 -04:00
martin f. krafft
85b8538e0e Expand usage of Python 2.6 if statement 
Syntax like "'foo' if bar else 'baz'" is not supported by all Python
versions targetted by Ansible. Hence we break it up.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-23 09:19:27 +02:00
martin f. krafft
3df2e15277 Let update-rc.d set changed flag properly 
When update-rc.d is used to enable/disable service, the changed flag was
always true (see #2189). This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-22 20:04:37 +02:00
Benjamin Schwarze
31bc25063e fix wrong argument_spec in digital_ocean module 
as 'required' and 'default' are mutually exclusive removed 'required' in preference of 'default'
 2013-06-22 14:48:25 +02:00
John Jarvis
a61ec2e6b3 typo 2013-06-21 13:45:14 -04:00
John Jarvis
c85b0bb05f using instance_ids and state=absent for removing instances 2013-06-21 13:43:29 -04:00
Vincent Viallet
7b0b9016b5 Improve error messages on missing required variables. 2013-06-21 21:41:00 +08:00
Vincent Viallet
c124411c36 Consistent wait_timeout between doc and module 2013-06-21 18:03:55 +09:00
Vincent Viallet
2eaf5ee206 Fix last bugs, complete all tests. 2013-06-21 17:01:29 +08:00
Vincent Viallet
17a55d6adf Update documentation 2013-06-21 13:59:09 +08:00
Vincent Viallet
9c26b9ddce Add linode cloud provider. 2013-06-21 13:41:33 +08:00
John Jarvis
3a5f095693 Adds termination support to the ec2 module 
Pass in the `instances` output of the ec2 module
to terminate a list of instances that were previously provisioned.

Useful for automated testing.
 2013-06-20 20:00:52 -04:00
Stephen Fromm
76d848331f Add submodule support to git module 
This does two things:
* add --recursive option to git clone command in clone().  This will
  initialize all submodules when cloning a remote repository.
* Add submodule_update() and call that from fetch().  submodule_update()
  calls two git commands iff the file .gitmodules exists in the
  repository:
  * 'git submodule sync' - synchronizes the submodules' remote URL
    configuration setting to the value in .gitmodules.
  * 'git submodule update --init --recursive' - initialize and update
    registered submodules to the commit specified in the index of the
    containing repository.

If a repository was cloned without --recursive, submodule_update() will
ensure that the submodules are initialized and updated.
 2013-06-20 14:48:39 -07:00
Mike Grozak
bba19cb998 Fixed typo 2013-06-20 12:46:23 +02:00
Mike Grozak
541b086883 Updated documentaion for the file module 2013-06-20 12:46:23 +02:00
Mike Grozak
6c44e264c9 added possibility to force symlinks to none-existent destination (which might appear later) 2013-06-20 12:43:23 +02:00
Mike Grozak
57154b04bb added force parameter to symlink invocation, in order to force the creation in case of already existing destination with the type of 'file' 2013-06-20 12:43:23 +02:00
Michael DeHaan
995ef374db Fixup versions of newly added modules. 2013-06-19 22:39:08 -04:00
Michael DeHaan
3f8aa8aec5 Fix up some module docs formatting errors. 2013-06-19 22:37:09 -04:00
Michael DeHaan
231d9b101d YAML fix 2013-06-19 22:33:19 -04:00
Michael DeHaan
b72109a04b Merge pull request #3273 from jlund/ansiblecc-to-ansibleworkscom 
Update all ansible.cc references in the documentation to point to ansibleworks.com
 2013-06-19 19:31:34 -07:00
Michael DeHaan
727cee509c Merge branch 'PR_add_chdir_to_pip' of git://github.com/y-p/ansible into devel 
Conflicts:
	library/packaging/pip
 2013-06-19 22:30:44 -04:00
Michael DeHaan
4c43264033 Various code reformatting 2013-06-19 22:23:31 -04:00
Michael DeHaan
db94171f5b Merge branch 'rds' of git://github.com/bpennypacker/ansible into rds 2013-06-19 22:11:41 -04:00
Michael DeHaan
2ed9b52481 Quote some strings in the docs 2013-06-19 22:10:48 -04:00
Michael DeHaan
e1abda42a9 Merge pull request #3171 from mynameisdaniil/devel 
Adds 'groups' field into ec2 plugin
 2013-06-19 19:06:29 -07:00
Michael DeHaan
c80ad67d7e Merge pull request #3226 from jpmens/ini_file2 
ini_file: add support for lists of options/values
 2013-06-19 18:59:19 -07:00
Michael DeHaan
faaa90ed03 Merge branch 'ocean' into devel 
Conflicts:
	library/cloud/digital_ocean
 2013-06-19 21:53:33 -04:00
Michael DeHaan
c9c45ac597 Reformat examples 2013-06-19 21:52:59 -04:00
Vincent Viallet
cc1cb01540 Rename digital ocean module to digital_ocean, add documentation. 2013-06-19 21:49:05 -04:00
Vincent Viallet
66b5689afb Ensure an existing ssh-key returns useful information (id + name) instead of a string; this way it can be used to register a variable to use in a later task. 2013-06-19 21:48:52 -04:00
Vincent Viallet
60d1ff125e Add digital-ocean cloud support. 2013-06-19 21:48:41 -04:00
Michael DeHaan
f9a09e10e5 Merge branch 'digitalocean' of git://github.com/devo-ps/ansible into ocean 2013-06-19 21:48:19 -04:00
Michael DeHaan
ffb94f2e71 Merge branch 'purge' into devel 2013-06-19 21:38:39 -04:00
martin f. krafft
6a7dac6176 Fix purging of packages 
A small error in the reuse of a variable caused packages to never get
purged. This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-19 21:37:37 -04:00
Michael DeHaan
50fa88f28a Merge branch 'fix-apt-purge' of git://github.com/madduck/ansible into purge 2013-06-19 21:35:28 -04:00
Joshua Lund
0f81d1630f * Updated all ansible.cc references in the documentation to point 
to ansibleworks.com
* Fixed a few misspelled words
 2013-06-19 19:34:02 -06:00
Michael DeHaan
6d6df1959c Merge pull request #3259 from dirtyharrycallahan/b_setup 
bug fix: modify get_device_facts to handle servers with multiple pci domains
 2013-06-19 18:24:10 -07:00
Michael DeHaan
d9c0a5c37d Revert "now modules can implement with_items list globbing w/o updating" 
This reverts commit 4942a06bc2.

Conflicts:

	lib/ansible/runner/__init__.py
 2013-06-19 19:00:18 -04:00
Daniil
07bea63533 Allow 'ec2.group' field to handle lists of groups 2013-06-20 01:23:30 +04:00
Michael DeHaan
0bd92d8196 Merge pull request #3262 from j2sol/add-host-name 
make name the parameter, with hostname as alias
 2013-06-19 08:33:12 -07:00
Michael DeHaan
5b1babbdc0 Merge pull request #3260 from lorin/migrate-noinput 
django_manage: Pass --noinput to migrate
 2013-06-19 08:31:19 -07:00
Michael DeHaan
d0a4f2d1e4 Merge pull request #3264 from arturaz/devel 
datadog_event module requires urllib2, not httplib2.
 2013-06-19 08:27:13 -07:00
Bruce Pennypacker
9098908cc8 Set master_password for modify command 2013-06-19 09:35:50 -04:00
martin f. krafft
ae42144752 Always assume purged for older python-apt 
Older python-apt modules don't export Package.installed_files and there
seems to be no other way to figure out if a package is
removed-but-not-purged, so we just always assume it's purged.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-19 10:56:43 +02:00
Arturas Slajus
0ea0a2c6d7 datadog_event module requires urllib2, not httplib2. 2013-06-19 11:17:05 +03:00
martin f. krafft
420f7d7ac6 Introduce non-purged package status 
A package may be removed but not purged with APT. The only way to
identify this state is by looking at the list of installed files of
a package. Even if the package has no files installed, this list will be
non-empty until the package is removed:

  # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files"
  <Package: name:'ruby1.8' id:1425> None [u'']

  # dpkg --purge ruby1.8
  (Reading database ... 27904 files and directories currently installed.)
  Removing ruby1.8 ...
  Purging configuration files for ruby1.8 ...

  # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files"
  <Package: name:'ruby1.8' id:1425> None []

See http://bugs.debian.org/712749 too.

If a package is not marked installed but it still 'has_files', then it
should be processed if the request is to purge it.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-19 10:00:33 +02:00
martin f. krafft
8e37a2bec9 Fix purging of packages 
A small error in the reuse of a variable caused packages to never get
purged. This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-06-19 10:00:33 +02:00
Jesse Keating
1074896105 make name the parameter, with hostname as alias 
name is used throughout Ansible, it's the "standard". This change
applies that standard to the add_host routine and updates the docs to
reflect that. Related to https://github.com/ansible/ansible/pull/3254
 2013-06-18 21:11:52 -07:00
Lorin Hochstein
1ef1b03bf6 django_manage: Pass --noinput to migrate 
The django 'migrate' command should receive the --noinput command,
otherwise it can block waiting for user input.
 2013-06-18 23:05:40 -04:00
Patrick Callahan
b5b862fe6f bug fix: modify get_device_facts to handle servers with multiple pci domains 
On machines with multiple pci domains get_device_facts would fail to
find a matching pci device causing setup to fail. Also on some platforms
there is additional information between the pci information and 'host'.
Modified get_device_facts to call lspci with the -D option and modified
the regex to account for the pci domain and to be more selective.
 2013-06-18 22:48:05 -04:00
Michael DeHaan
575e052c6c Merge pull request #3147 from toshywoshy/setup_mtab_without_bind 
changed get_mount_facts to ignore mount types 'none'
 2013-06-18 17:56:49 -07:00
Michael DeHaan
1e3ab98a13 Merge pull request #3219 from arturaz/devel 
datadog_event module: submit your events to DataDog service.
 2013-06-18 17:31:52 -07:00
Michael DeHaan
dd7f7d5593 Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel 
Conflicts:
	library/files/file
 2013-06-18 20:31:05 -04:00
Michael DeHaan
61ac8d03af Clarify module docs 2013-06-18 20:19:29 -04:00
Michael DeHaan
31b63b033b Merge conflict 2013-06-18 20:18:17 -04:00
Michael DeHaan
96134d003e Merge remote branch 'origin/devel' into devel 2013-06-18 20:17:31 -04:00
Michael DeHaan
51ba3d8c3d Merge pull request #3230 from sayap/openrc 
Add OpenRC support to the service module.
 2013-06-18 17:13:06 -07:00
Michael DeHaan
273f37b394 Merge pull request #3255 from jlund/sha256-example-cleanup 
Removed merge conflict header
 2013-06-18 17:08:59 -07:00
Michael DeHaan
2f1420f071 Merge pull request #3258 from j2sol/apt-doc 
pkg option of apt is not required
 2013-06-18 16:56:35 -07:00
Jesse Keating
86bc2ec08a pkg option of apt is not required 
You can use apt module with update_cache and without specifying a
package. Update the docs to reflect this.
 2013-06-18 16:25:46 -07:00
Joshua Lund
bb4de94937 Removed merge conflict header 2013-06-18 15:01:01 -06:00
Michael DeHaan
b4358d1300 Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel 
Conflicts:
	library/packaging/apt_key
 2013-06-18 16:18:31 -04:00
Michael DeHaan
a94e404a97 Merge pull request #3236 from lwade/ec2_placementzone 
Added placement_group parameter for cluster compute. Issue 3232.
 2013-06-18 13:14:03 -07:00
Michael DeHaan
583b3e5957 Merge pull request #3251 from jlund/sucess-typo-fix 
Fixed a few small typos
 2013-06-18 11:47:49 -07:00
Michael DeHaan
2123507315 Merge branch 'sha256' of git://github.com/jlund/ansible into devel 
Conflicts:
	library/network/get_url
 2013-06-18 14:46:57 -04:00
Joshua Lund
ba853b8c1a Fixed a few small typos 2013-06-18 12:26:40 -06:00
Michael DeHaan
25b43cf6ec Merge pull request #3231 from jpmens/docs_more 
Docs: consistently format playbook EXAMPLES
 2013-06-17 20:48:02 -07:00