summaryrefslogtreecommitdiff
path: root/docsite
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2014-08-08 13:52:36 -0400
committerMichael DeHaan <michael.dehaan@gmail.com>2014-08-08 13:52:36 -0400
commitf8cc5bc24d24da89efed0bc2189b0ee0520b5e19 (patch)
treeed42f54f6f1f816a6e1383a090d0e63d073a9fae /docsite
parenta48328fa125b1f1cd4cc604f37df4be2144ef44c (diff)
parent18b41ebda5da814adc01c264bc0ad2ae3264be7a (diff)
downloadansible-f8cc5bc24d24da89efed0bc2189b0ee0520b5e19.tar.gz
Merge pull request #7314 from bonifaido/patch-1
Ansible inventory file location fixed
Diffstat (limited to 'docsite')
-rw-r--r--docsite/rst/guide_vagrant.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docsite/rst/guide_vagrant.rst b/docsite/rst/guide_vagrant.rst
index 3a15617e30..8dc8d10b44 100644
--- a/docsite/rst/guide_vagrant.rst
+++ b/docsite/rst/guide_vagrant.rst
@@ -93,8 +93,8 @@ Sometimes you may want to run Ansible manually against the machines. This is
pretty easy to do.
Vagrant automatically creates an inventory file for each Vagrant machine in
-the same directory called ``vagrant_ansible_inventory_machinename``. It
-configures the inventory file according to the SSH tunnel that Vagrant
+the same directory located under ``.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory``.
+It configures the inventory file according to the SSH tunnel that Vagrant
automatically creates, and executes ``ansible-playbook`` with the correct
username and SSH key options to allow access. A typical automatically-created
inventory file may look something like this:
@@ -114,7 +114,7 @@ Here is an example:
.. code-block:: bash
- $ ansible-playbook -i vagrant_ansible_inventory_machinename --private-key=~/.vagrant.d/insecure_private_key -u vagrant playbook.yml
+ $ ansible-playbook -i .vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory --private-key=~/.vagrant.d/insecure_private_key -u vagrant playbook.yml
.. seealso::