Merge pull request #4333 from rickard-von-essen/puppet-server-doc-fix

provisioner/puppet-server: Fixed formatting for execute_command
This commit is contained in:
Rickard von Essen 2016-12-28 22:06:41 +01:00 committed by GitHub
commit 0651bcb7a8
1 changed files with 9 additions and 8 deletions

View File

@ -85,14 +85,15 @@ listed below:
variables](/docs/templates/configuration-templates.html) available. See variables](/docs/templates/configuration-templates.html) available. See
below for more information. By default, Packer uses the following command: below for more information. By default, Packer uses the following command:
``` {{.FacterVars}} {{if .Sudo}} sudo -E {{end}}" + ```
"puppet agent --onetime --no-daemonize " + {{.FacterVars}} {{if .Sudo}} sudo -E {{end}} \
"{{if ne .PuppetServer \"\"}}--server='{{.PuppetServer}}' {{end}}" + puppet agent --onetime --no-daemonize \
"{{if ne .Options \"\"}}{{.Options}} {{end}}" + {{if ne .PuppetServer \"\"}}--server='{{.PuppetServer}}' {{end}} \
"{{if ne .PuppetNode \"\"}}--certname={{.PuppetNode}} {{end}}" + {{if ne .Options \"\"}}{{.Options}} {{end}} \
"{{if ne .ClientCertPath \"\"}}--certdir='{{.ClientCertPath}}' {{end}}" + {{if ne .PuppetNode \"\"}}--certname={{.PuppetNode}} {{end}} \
"{{if ne .ClientPrivateKeyPath \"\"}}--privatekeydir='{{.ClientPrivateKeyPath}}' {{end}}" + {{if ne .ClientCertPath \"\"}}--certdir='{{.ClientCertPath}}' {{end}} \
"--detailed-exitcodes {{if ne .ClientPrivateKeyPath \"\"}}--privatekeydir='{{.ClientPrivateKeyPath}}' \
{{end}} --detailed-exitcodes
``` ```
## Default Facts ## Default Facts