diff options
| author | danielsdeleo <dan@getchef.com> | 2014-09-02 15:20:56 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@getchef.com> | 2014-09-03 12:44:46 -0700 |
| commit | ae7d23c48b9d93b0e10789eb3f0e307a18351d99 (patch) | |
| tree | c0a9f5208a641069640473e1c9879573ecc56180 /lib/chef/application/client.rb | |
| parent | b4145b8ea22c91d22fc66fd585e36e1a415ede38 (diff) | |
| download | chef-ae7d23c48b9d93b0e10789eb3f0e307a18351d99.tar.gz | |
Remove config file jail, replaced with config skip option
Diffstat (limited to 'lib/chef/application/client.rb')
| -rw-r--r-- | lib/chef/application/client.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 1dc29db307..c4d6bb4e24 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -220,10 +220,6 @@ class Chef::Application::Client < Chef::Application :long => "--chef-zero-port PORT", :description => "Port (or port range) to start chef-zero on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works." - option :config_file_jail, - :long => "--config-file-jail PATH", - :description => "Directory under which config files are allowed to be loaded (no client.rb or knife.rb outside this path will be loaded)." - option :dont_load_config, :long => "--dont-load-config", :description => "Refuse to load a config file and use defaults. This is for development and not a stable API", @@ -279,7 +275,6 @@ class Chef::Application::Client < Chef::Application end def load_config_file - Chef::Config.config_file_jail = config[:config_file_jail] if config[:config_file_jail] if !config.has_key?(:config_file) && !config[:dont_load_config] if config[:local_mode] config[:config_file] = Chef::WorkstationConfigLoader.new(nil).config_location |