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

Add the option to add arbitrary `client.rb` options 

Fixes #3630
This commit is contained in:
Sander van Harmelen 2016-01-09 00:42:02 +01:00
parent f4e138f2db
commit 71ffb6caa0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,11 +64,15 @@ ENV['HTTPS_PROXY'] = "{{ .HTTPSProxy }}"
{{ if .SSLVerifyMode }}ssl_verify_mode {{ .SSLVerifyMode }}{{ end }} {{ if .SSLVerifyMode }}ssl_verify_mode {{ .SSLVerifyMode }}{{ end }}
{{ if .DisableReporting }}enable_reporting false{{ end }} {{ if .DisableReporting }}enable_reporting false{{ end }}
{{ if .ClientOptions }}{{ join .ClientOptions "\n" }}{{ end }}
` `
// Provisioner represents a specificly configured chef provisioner // Provisioner represents a specificly configured chef provisioner
type Provisioner struct { type Provisioner struct {
Attributes interface{} `mapstructure:"attributes"` Attributes interface{} `mapstructure:"attributes"`
ClientOptions []string `mapstructure:"client_options"`
DisableReporting bool `mapstructure:"disable_reporting"`
Environment string `mapstructure:"environment"` Environment string `mapstructure:"environment"`
LogToFile bool `mapstructure:"log_to_file"` LogToFile bool `mapstructure:"log_to_file"`
UsePolicyfile bool `mapstructure:"use_policyfile"` UsePolicyfile bool `mapstructure:"use_policyfile"`
@ -86,7 +90,6 @@ 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"`

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

@ -52,6 +52,12 @@ The following arguments are supported:
* `attributes (map)` - (Optional) A map with initial node attributes for the new node. * `attributes (map)` - (Optional) A map with initial node attributes for the new node.
See example. See example.
* `client_options (array)` - (Optional) A list of optional Chef Client configuration
options. See the Chef Client [documentation](https://docs.chef.io/config_rb_client.html) for all available options.
* `disable_reporting (boolean)` - (Optional) If true the Chef Client will not try to send
reporting data (used by Chef Reporting) to the Chef Server (defaults false)
* `environment (string)` - (Optional) The Chef environment the new node will be joining * `environment (string)` - (Optional) The Chef environment the new node will be joining
(defaults `_default`). (defaults `_default`).
@ -98,10 +104,6 @@ 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.