summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-01-14 15:54:10 -0800
committerJohn Keiser <john@johnkeiser.com>2016-01-15 09:37:43 -0800
commitb2459629889fe66a6c70774bcbe2c93cbcaa2fa7 (patch)
treec665f2cdd15ec771175046c1e33e0f0d24362d56
parent15eeec09c22da15370152a40311f085f0aced9e2 (diff)
downloadchef-b2459629889fe66a6c70774bcbe2c93cbcaa2fa7.tar.gz
Fix unused variables and commentsjk/cookbook-artifacts
-rw-r--r--chef-config/lib/chef-config/config.rb2
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index 47fca29e7f..5705ffbf56 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -180,7 +180,6 @@ module ChefConfig
# Location of groups on disk. String or array of strings.
# Defaults to <chef_repo_path>/groups.
- # Only applies to Enterprise Chef commands.
default(:group_path) { derive_path_from_chef_repo_path("groups") }
# Location of nodes on disk. String or array of strings.
@@ -201,7 +200,6 @@ module ChefConfig
# Location of users on disk. String or array of strings.
# Defaults to <chef_repo_path>/users.
- # Does not apply to Enterprise Chef commands.
default(:user_path) { derive_path_from_chef_repo_path("users") }
# Location of policies on disk. String or array of strings.
diff --git a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
index 9c9a0d1001..969cea876e 100644
--- a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
@@ -82,7 +82,6 @@ class Chef
@environment = chef_config[:environment]
@repo_mode = chef_config[:repo_mode]
@versioned_cookbooks = chef_config[:versioned_cookbooks]
- @policy_document_native_api = chef_config[:policy_document_native_api]
@root_name = root_name
@cookbook_version = options[:cookbook_version] # Used in knife diff and download for server cookbook version
end
@@ -94,7 +93,6 @@ class Chef
attr_reader :repo_mode
attr_reader :cookbook_version
attr_reader :versioned_cookbooks
- attr_reader :policy_document_native_api
def fs_description
"Chef server at #{chef_server_url} (user #{chef_username}), repo_mode = #{repo_mode}"