Skip to content

A
ansible
Commit 9ed246e4 by Michael DeHaan
Options

Resolve merge conflict.

parent 26819d70
Showing with 0 additions and 3 deletions
docsite/latest/rst/playbooks.rst
...@@ -417,8 +417,6 @@ inside another. ...@@ -417,8 +417,6 @@ inside another.
play are going to get the same tasks. ('only_if' provides some play are going to get the same tasks. ('only_if' provides some
ability for hosts to conditionally skip tasks). ability for hosts to conditionally skip tasks).
<<<<<<< HEAD:docsite/rst/playbooks.rst
=======
Roles Roles
````` `````
...@@ -480,7 +478,6 @@ Also, should you wish to parameterize roles, by adding variables, you can do so, ...@@ -480,7 +478,6 @@ Also, should you wish to parameterize roles, by adding variables, you can do so,
- { role: foo_app_instance, dir: '/opt/a', port: 5000 } - { role: foo_app_instance, dir: '/opt/a', port: 5000 }
- { role: foo_app_instance, dir: '/opt/b', port: 5001 } - { role: foo_app_instance, dir: '/opt/b', port: 5001 }
>>>>>>> Docs on parameterized roles, make document generation output less noisy:docsite/latest/rst/playbooks.rst
Executing A Playbook Executing A Playbook
```````````````````` ````````````````````
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment