Support all chef-client options in knife converge

1 files changed, 13 insertions, 10 deletions

diff --git a/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb
index 860fdbca48..e69e07e744 100644
--- a/lib/chef/chef_fs/knife.rb
+++ b/lib/chef/chef_fs/knife.rb
@@ -35,22 +35,25 @@ class Chef
 
       def self.inherited(c)
         super
+
         # Ensure we always get to do our includes, whether subclass calls deps or not
         c.deps do
         end
 
-        option :repo_mode,
-          :long => '--repo-mode MODE',
-          :description => "Specifies the local repository layout.  Values: static, everything, hosted_everything.  Default: everything/hosted_everything"
+        c.options.merge!(options)
+      end
+
+      option :repo_mode,
+        :long => '--repo-mode MODE',
+        :description => "Specifies the local repository layout.  Values: static, everything, hosted_everything.  Default: everything/hosted_everything"
 
-        option :chef_repo_path,
-          :long => '--chef-repo-path PATH',
-          :description => 'Overrides the location of chef repo. Default is specified by chef_repo_path in the config'
+      option :chef_repo_path,
+        :long => '--chef-repo-path PATH',
+        :description => 'Overrides the location of chef repo. Default is specified by chef_repo_path in the config'
 
-        option :concurrency,
-          :long => '--concurrency THREADS',
-          :description => 'Maximum number of simultaneous requests to send (default: 10)'
-      end
+      option :concurrency,
+        :long => '--concurrency THREADS',
+        :description => 'Maximum number of simultaneous requests to send (default: 10)'
 
       def configure_chef
         super