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

Merge pull request #4569 from partamonov/origin/chef-provisioner-reporting 

Origin/chef provisioner reporting
This commit is contained in:
Sander van Harmelen 2016-01-08 21:12:01 +01:00
parent 5912bf25b4 84bb5154be
commit 7dcf0de741
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -98,6 +98,10 @@ The following arguments are supported:
* `ssl_verify_mode (string)` - (Optional) Use to set the verify mode for Chef Client HTTPS * `ssl_verify_mode (string)` - (Optional) Use to set the verify mode for Chef Client HTTPS
requests. requests.
* `disable_reporting (boolean)` - (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 * `validation_client_name (string)` - (Required) The name of the validation client to use
for the initial communication with the Chef Server. for the initial communication with the Chef Server.