ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified to have less code and not to verify incoming string

This commit is contained in:
Petr Artamonov 2016-01-08 20:00:11 +01:00
parent 063abc866c
commit 76913703a9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/provisioners/chef/resource_provisioner.go
View File

@ -63,7 +63,7 @@ ENV['HTTPS_PROXY'] = "{{ .HTTPSProxy }}"
{{ if .NOProxy }}no_proxy "{{ join .NOProxy "," }}"{{ end }}
{{ if .SSLVerifyMode }}ssl_verify_mode {{ .SSLVerifyMode }}{{ end }}
{{ if .EnableReporting }}enable_reporting {{ .EnableReporting }}{{ end }}
{{ if .DisableReporting }}enable_reporting false{{ end }}
`
// Provisioner represents a specificly configured chef provisioner
@ -86,7 +86,7 @@ type Provisioner struct {
ServerURL string `mapstructure:"server_url"`
SkipInstall bool `mapstructure:"skip_install"`
SSLVerifyMode string `mapstructure:"ssl_verify_mode"`
EnableReporting string `mapstructure:"enable_reporting"`
DisableReporting bool `mapstructure:"disable_reporting"`
ValidationClientName string `mapstructure:"validation_client_name"`
ValidationKey string `mapstructure:"validation_key"`
Version string `mapstructure:"version"`

5
website/source/docs/provisioners/chef.html.markdown
View File

@ -98,8 +98,9 @@ The following arguments are supported:
* `ssl_verify_mode (string)` - (Optional) Use to set the verify mode for Chef Client HTTPS
requests.
* `enable_reporting (string)` - (Optional) Cause the chef-client to send data to the Chef
server for use with Chef reporting, if flag is omitted default value is `true`
* `disable_reporting (string)` - (Optional) Use to disable the chef-client data sending to
the Chef server for use with Chef reporting, if flag is omitted default behavior is to send
reporting data.
* `validation_client_name (string)` - (Required) The name of the validation client to use
for the initial communication with the Chef Server.