From 52f5f2b895257265916c8a67963231dd0e47d19d Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 27 Nov 2017 15:10:29 -0800 Subject: [PATCH 1/4] clarify where ansible-local runs --- .../docs/provisioners/ansible-local.html.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/website/source/docs/provisioners/ansible-local.html.md b/website/source/docs/provisioners/ansible-local.html.md index 92d46fb3d..439abb63a 100644 --- a/website/source/docs/provisioners/ansible-local.html.md +++ b/website/source/docs/provisioners/ansible-local.html.md @@ -1,8 +1,10 @@ --- description: | - The ansible-local Packer provisioner configures Ansible to run on the - machine by Packer from local Playbook and Role files. Playbooks and Roles can - be uploaded from your local machine to the remote machine. + The ansible-local Packer provisioner will run ansible "locally" on the + remote/guest VM using Playbook and Role files that exist on the guest VM. + This means ansible must be installed on the remote/guest VM. Playbooks and + Roles can be uploaded from your local machine (the one running Packer) to + the vm. layout: docs page_title: 'Ansible Local - Provisioners' sidebar_current: 'docs-provisioners-ansible-local' @@ -12,15 +14,17 @@ sidebar_current: 'docs-provisioners-ansible-local' Type: `ansible-local` -The `ansible-local` Packer provisioner configures Ansible to run on the machine -by Packer from local Playbook and Role files. Playbooks and Roles can be -uploaded from your local machine to the remote machine. Ansible is run in [local +The `ansible-local` Packer provisioner will run ansible "locally" on the + remote/guest VM using Playbook and Role files that exist on the guest VM. + This means ansible must be installed on the remote/guest VM. Playbooks and + Roles can be uploaded from your local machine (the one running Packer) to + the vm. Ansible is run on the guest machine in [local mode](https://docs.ansible.com/ansible/playbooks_delegation.html#local-playbooks) via the `ansible-playbook` command. -> **Note:** Ansible will *not* be installed automatically by this provisioner. This provisioner expects that Ansible is already installed on the -machine. It is common practice to use the [shell +guest/remote machine. It is common practice to use the [shell provisioner](/docs/provisioners/shell.html) before the Ansible provisioner to do this. From 150bf1f6dab86fdfc4d0bcbd8fac9b2fe3a7404c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 27 Nov 2017 15:15:52 -0800 Subject: [PATCH 2/4] clarify shell-local location --- .../source/docs/provisioners/shell-local.html.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/website/source/docs/provisioners/shell-local.html.md b/website/source/docs/provisioners/shell-local.html.md index bb9022453..e812f3228 100644 --- a/website/source/docs/provisioners/shell-local.html.md +++ b/website/source/docs/provisioners/shell-local.html.md @@ -1,8 +1,9 @@ --- description: | - The shell Packer provisioner provisions machines built by Packer using shell - scripts. Shell provisioning is the easiest way to get software installed and - configured on a machine. + shell-local will run a shell script of your choosing on the machine where Packer + is being run - in other words, it shell-local will run the shell script on your + build server, or your desktop, etc., rather than the remote/guest machine being + provisioned by Packer. layout: docs page_title: 'Shell (Local) - Provisioners' sidebar_current: 'docs-provisioners-shell-local' @@ -12,8 +13,12 @@ sidebar_current: 'docs-provisioners-shell-local' Type: `shell-local` -The local shell provisioner executes a local shell script on the machine running -Packer. The [remote shell](/docs/provisioners/shell.html) provisioner executes +shell-local will run a shell script of your choosing on the machine where Packer +is being run - in other words, it shell-local will run the shell script on your +build server, or your desktop, etc., rather than the remote/guest machine being +provisioned by Packer. + +The [remote shell](/docs/provisioners/shell.html) provisioner executes shell scripts on a remote machine. ## Basic Example From df492d35bfb608ed5f5087c9d3bb4e5a57630742 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 27 Nov 2017 15:17:54 -0800 Subject: [PATCH 3/4] remove confusing use of local. dang. --- .../source/docs/provisioners/ansible-local.html.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/source/docs/provisioners/ansible-local.html.md b/website/source/docs/provisioners/ansible-local.html.md index 439abb63a..cec5eee17 100644 --- a/website/source/docs/provisioners/ansible-local.html.md +++ b/website/source/docs/provisioners/ansible-local.html.md @@ -14,12 +14,12 @@ sidebar_current: 'docs-provisioners-ansible-local' Type: `ansible-local` -The `ansible-local` Packer provisioner will run ansible "locally" on the - remote/guest VM using Playbook and Role files that exist on the guest VM. - This means ansible must be installed on the remote/guest VM. Playbooks and - Roles can be uploaded from your local machine (the one running Packer) to - the vm. Ansible is run on the guest machine in [local -mode](https://docs.ansible.com/ansible/playbooks_delegation.html#local-playbooks) via the +The `ansible-local` Packer provisioner will run ansible in ansible's "local" + mode on the remote/guest VM using Playbook and Role files that exist on the + guest VM. This means ansible must be installed on the remote/guest VM. + Playbooks and Roles can be uploaded from your build machine + (the one running Packer) to the vm. Ansible is then run on the guest machine + in [local mode](https://docs.ansible.com/ansible/playbooks_delegation.html#local-playbooks) via the `ansible-playbook` command. -> **Note:** Ansible will *not* be installed automatically by this From a325780aa59da7122d98858d7cb953ee026611a9 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 27 Nov 2017 15:18:58 -0800 Subject: [PATCH 4/4] make description match --- website/source/docs/provisioners/ansible-local.html.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/source/docs/provisioners/ansible-local.html.md b/website/source/docs/provisioners/ansible-local.html.md index cec5eee17..b6e7028d9 100644 --- a/website/source/docs/provisioners/ansible-local.html.md +++ b/website/source/docs/provisioners/ansible-local.html.md @@ -1,10 +1,10 @@ --- description: | - The ansible-local Packer provisioner will run ansible "locally" on the - remote/guest VM using Playbook and Role files that exist on the guest VM. - This means ansible must be installed on the remote/guest VM. Playbooks and - Roles can be uploaded from your local machine (the one running Packer) to - the vm. + The ansible-local Packer provisioner will run ansible in ansible's "local" + mode on the remote/guest VM using Playbook and Role files that exist on the + guest VM. This means ansible must be installed on the remote/guest VM. + Playbooks and Roles can be uploaded from your build machine + (the one running Packer) to the vm. layout: docs page_title: 'Ansible Local - Provisioners' sidebar_current: 'docs-provisioners-ansible-local'