Merge branch 'devel' of git://github.com/beefsalad/ansible into devel

This commit is contained in:
Michael DeHaan 2013-12-26 13:41:42 -05:00
commit 4765032fcb

View file

@ -31,7 +31,7 @@ module: yum
version_added: historical version_added: historical
short_description: Manages packages with the I(yum) package manager short_description: Manages packages with the I(yum) package manager
description: description:
- Will install, upgrade, remove, and list packages with the I(yum) package manager. - Will install, upgrade, remove, and list packages or package groups with the I(yum) package manager.
options: options:
name: name:
description: description:
@ -94,12 +94,19 @@ author: Seth Vidal
''' '''
EXAMPLES = ''' EXAMPLES = '''
# description: installs the latest version of httpd
- yum: name=httpd state=latest - yum: name=httpd state=latest
# description: removes the httpd package
- yum: name=httpd state=removed - yum: name=httpd state=removed
# description: installs the latest version of httpd from the testing repo
- yum: name=httpd enablerepo=testing state=installed - yum: name=httpd enablerepo=testing state=installed
# description: upgrades all packages
- yum: name=* state=latest - yum: name=* state=latest
# description: installs the nginx rpm from a remote repo
- yum: name=http://nginx.org/packages/centos/6/noarch/RPMS/nginx-release-centos-6-0.el6.ngx.noarch.rpm state=present - yum: name=http://nginx.org/packages/centos/6/noarch/RPMS/nginx-release-centos-6-0.el6.ngx.noarch.rpm state=present
# description: installs nginx rpm from a local file
- yum: name=/usr/local/src/nginx-release-centos-6-0.el6.ngx.noarch.rpm state=present - yum: name=/usr/local/src/nginx-release-centos-6-0.el6.ngx.noarch.rpm state=present
# description: installs the package group 'Development tool'
- yum: name="@Development tools" state=present - yum: name="@Development tools" state=present
''' '''