From 71ffb6caa01b2962ade887b9b14c40cf41cc1d35 Mon Sep 17 00:00:00 2001
From: Sander van Harmelen <svanharmelen@schubergphilis.com>
Date: Sat, 9 Jan 2016 00:42:02 +0100
Subject: [PATCH] Add the option to add arbitrary `client.rb` options

Fixes #3630
---
 builtin/provisioners/chef/resource_provisioner.go   |  5 ++++-
 website/source/docs/provisioners/chef.html.markdown | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/builtin/provisioners/chef/resource_provisioner.go b/builtin/provisioners/chef/resource_provisioner.go
index b44118a44..0e8c894d9 100644
--- a/builtin/provisioners/chef/resource_provisioner.go
+++ b/builtin/provisioners/chef/resource_provisioner.go
@@ -64,11 +64,15 @@ ENV['HTTPS_PROXY'] = "{{ .HTTPSProxy }}"
 {{ if .SSLVerifyMode }}ssl_verify_mode {{ .SSLVerifyMode }}{{ end }}
 
 {{ if .DisableReporting }}enable_reporting false{{ end }}
+
+{{ if .ClientOptions }}{{ join .ClientOptions "\n" }}{{ end }}
 `
 
 // Provisioner represents a specificly configured chef provisioner
 type Provisioner struct {
 	Attributes           interface{} `mapstructure:"attributes"`
+	ClientOptions        []string    `mapstructure:"client_options"`
+	DisableReporting     bool        `mapstructure:"disable_reporting"`
 	Environment          string      `mapstructure:"environment"`
 	LogToFile            bool        `mapstructure:"log_to_file"`
 	UsePolicyfile        bool        `mapstructure:"use_policyfile"`
@@ -86,7 +90,6 @@ type Provisioner struct {
 	ServerURL            string      `mapstructure:"server_url"`
 	SkipInstall          bool        `mapstructure:"skip_install"`
 	SSLVerifyMode        string      `mapstructure:"ssl_verify_mode"`
-	DisableReporting     bool        `mapstructure:"disable_reporting"`
 	ValidationClientName string      `mapstructure:"validation_client_name"`
 	ValidationKey        string      `mapstructure:"validation_key"`
 	Version              string      `mapstructure:"version"`
diff --git a/website/source/docs/provisioners/chef.html.markdown b/website/source/docs/provisioners/chef.html.markdown
index 73ba30524..e4b89f23f 100644
--- a/website/source/docs/provisioners/chef.html.markdown
+++ b/website/source/docs/provisioners/chef.html.markdown
@@ -52,6 +52,12 @@ The following arguments are supported:
 * `attributes (map)` - (Optional) A map with initial node attributes for the new node.
   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
   (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
   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
   for the initial communication with the Chef Server.