summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-10-20 08:48:51 -0400
committerBrian Coca <bcoca@ansible.com>2015-10-20 08:48:51 -0400
commit02c8b13cc6d0593c1ea74d4a5740e04f98bd2043 (patch)
tree18492db32421edb88d58df1c7660b0149e5e07c5
parenta22cf8ffc110401b9e3cfa8a8e6dc7c3af57ec2d (diff)
parent84967e282a1b6613556caa67a8e7664b1c3fa889 (diff)
downloadansible-02c8b13cc6d0593c1ea74d4a5740e04f98bd2043.tar.gz
Merge pull request #12835 from zarnovican/remove_yum_pkg
DOC: in yum examples, 'pkg' arg renamed to 'name'
-rw-r--r--docsite/rst/playbooks_best_practices.rst2
-rw-r--r--docsite/rst/playbooks_intro.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/docsite/rst/playbooks_best_practices.rst b/docsite/rst/playbooks_best_practices.rst
index 9b0651fcd2..ecca4d75cb 100644
--- a/docsite/rst/playbooks_best_practices.rst
+++ b/docsite/rst/playbooks_best_practices.rst
@@ -205,7 +205,7 @@ Below is an example tasks file that explains how a role works. Our common role
# file: roles/common/tasks/main.yml
- name: be sure ntp is installed
- yum: pkg=ntp state=installed
+ yum: name=ntp state=installed
tags: ntp
- name: be sure ntp is configured
diff --git a/docsite/rst/playbooks_intro.rst b/docsite/rst/playbooks_intro.rst
index 69eeff6236..78e7fbccf2 100644
--- a/docsite/rst/playbooks_intro.rst
+++ b/docsite/rst/playbooks_intro.rst
@@ -62,7 +62,7 @@ For starters, here's a playbook that contains just one play::
remote_user: root
tasks:
- name: ensure apache is at the latest version
- yum: pkg=httpd state=latest
+ yum: name=httpd state=latest
- name: write the apache config file
template: src=/srv/httpd.j2 dest=/etc/httpd.conf
notify:
@@ -88,7 +88,7 @@ YAML dictionaries to supply the modules with their ``key=value`` arguments.::
tasks:
- name: ensure apache is at the latest version
yum:
- pkg: httpd
+ name: httpd
state: latest
- name: write the apache config file
template:
@@ -115,7 +115,7 @@ the web servers, and then the database servers. For example::
tasks:
- name: ensure apache is at the latest version
- yum: pkg=httpd state=latest
+ yum: name=httpd state=latest
- name: write the apache config file
template: src=/srv/httpd.j2 dest=/etc/httpd.conf