From 801d6b35daef830dc570c066247e91fe23245287 Mon Sep 17 00:00:00 2001 From: Guillaume Mella Date: Fri, 21 Oct 2016 11:17:09 +0200 Subject: [PATCH 1/2] fix hosts.yml filename for inventory trying to help user understand that directory can be used as -i argument values. --- docsite/rst/playbooks_best_practices.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docsite/rst/playbooks_best_practices.rst b/docsite/rst/playbooks_best_practices.rst index eef286b791..14351383ff 100644 --- a/docsite/rst/playbooks_best_practices.rst +++ b/docsite/rst/playbooks_best_practices.rst @@ -27,8 +27,8 @@ Directory Layout The top level of the directory would contain files and directories like so:: - production # inventory file for production servers - staging # inventory file for staging environment + production # inventory file for production servers (or directory that contains hosts.yml) + staging # inventory file for staging environment (or directory that contains hosts.yml) group_vars/ group1 # here we assign variables to particular groups @@ -77,7 +77,7 @@ Alternatively you can put each inventory file with its ``group_vars``/``host_var inventories/ production/ - hosts.ini # inventory file for production servers + hosts.yml # inventory file for production servers group_vars/ group1 # here we assign variables to particular groups group2 # "" @@ -86,7 +86,7 @@ Alternatively you can put each inventory file with its ``group_vars``/``host_var hostname2 # "" staging/ - hosts.ini # inventory file for staging environment + hosts.yml # inventory file for staging environment group_vars/ group1 # here we assign variables to particular groups group2 # "" From 1f176475b4f8dd29dbda2e5862e521a69697dd3c Mon Sep 17 00:00:00 2001 From: Guillaume Mella Date: Thu, 27 Oct 2016 09:39:46 +0200 Subject: [PATCH 2/2] apply comment feedback and leave only typo fix --- docsite/rst/playbooks_best_practices.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docsite/rst/playbooks_best_practices.rst b/docsite/rst/playbooks_best_practices.rst index 14351383ff..c67feb95f0 100644 --- a/docsite/rst/playbooks_best_practices.rst +++ b/docsite/rst/playbooks_best_practices.rst @@ -27,8 +27,8 @@ Directory Layout The top level of the directory would contain files and directories like so:: - production # inventory file for production servers (or directory that contains hosts.yml) - staging # inventory file for staging environment (or directory that contains hosts.yml) + production # inventory file for production servers + staging # inventory file for staging environment group_vars/ group1 # here we assign variables to particular groups