diff --git a/website/source/docs/provisioners/puppet-masterless.html.md b/website/source/docs/provisioners/puppet-masterless.html.md index b8c6a73cd..8f3a9a2b7 100644 --- a/website/source/docs/provisioners/puppet-masterless.html.md +++ b/website/source/docs/provisioners/puppet-masterless.html.md @@ -86,6 +86,11 @@ Optional parameters: This option was deprecated in puppet 3.6, and removed in puppet 4.0. If you have multiple manifests you should use `manifest_file` instead. +- `puppet_bin_dir` (string) - The path to the binary for running `puppet apply`. + Usually, this would be found via the `$PATH` or `%PATH%` environment variable, + but some builders (notably, the Docker one) do not run profile-setup scripts, + therefore the Path is usually empty. + - `module_paths` (array of strings) - This is an array of paths to module directories on your local filesystem. These will be uploaded to the remote machine. By default, this is empty. @@ -114,7 +119,8 @@ readability) to execute Puppet: ``` {.liquid} cd {{.WorkingDir}} && \ -{{.FacterVars}}{{if .Sudo}} sudo -E {{end}}puppet apply \ +{{.FacterVars}}{{if .Sudo}} sudo -E {{end}} \ +{{if ne .PuppetBinDir \"\"}}{{.PuppetBinDir}}{{end}}puppet apply \ --verbose \ --modulepath='{{.ModulePath}}' \ {{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}} \ diff --git a/website/source/docs/provisioners/puppet-server.html.md b/website/source/docs/provisioners/puppet-server.html.md index 07e6e704d..16ac34d2c 100644 --- a/website/source/docs/provisioners/puppet-server.html.md +++ b/website/source/docs/provisioners/puppet-server.html.md @@ -75,6 +75,11 @@ listed below: to create directories and write into this folder. If the permissions are not correct, use a shell provisioner prior to this to configure it properly. +- `puppet_bin_dir` (string) - The path to the binary for running `puppet apply`. + Usually, this would be found via the `$PATH` or `%PATH%` environment variable, + but some builders (notably, the Docker one) do not run profile-setup scripts, + therefore the Path is usually empty. + - `execute_command` (string) - This is optional. The command used to execute Puppet. This has various [configuration template variables](/docs/templates/configuration-templates.html) available. See