summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--lib/chef/knife/serve.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1418235ebc..c2a03aaf91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,8 @@ group(:development, :test) do
gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
end
+gem 'chef-zero', :path => '../chef-zero'
+
# If you want to load debugging tools into the bundle exec sandbox,
# add these additional dependencies into chef/Gemfile.local
eval(IO.read(__FILE__ + '.local'), binding) if File.exists?(__FILE__ + '.local')
diff --git a/lib/chef/knife/serve.rb b/lib/chef/knife/serve.rb
index 0e9dff937d..5b2b521303 100644
--- a/lib/chef/knife/serve.rb
+++ b/lib/chef/knife/serve.rb
@@ -5,7 +5,7 @@ class Chef
class Serve < Knife
option :repo_mode,
:long => '--repo-mode MODE',
- :description => "Specifies the local repository layout. Values: static, everything, hosted_everything. Default: everything/hosted_everything"
+ :description => "Specifies the local repository layout. Values: static (only environments/roles/data_bags/cookbooks), everything (includes nodes/clients/users), hosted_everything (includes acls/groups/etc. for Enterprise/Hosted Chef). Default: everything/hosted_everything"
option :chef_repo_path,
:long => '--chef-repo-path PATH',