Deprecation warning in bootstrap, drop chef-server

jtimberman · jtimberman · commit 4361d55819a1 · 2010-06-07T17:05:06.000-06:00
As the bootstrap cookbook is considered deprecated,
issue a warning as such in both recipes.

Also drop the chef-server gem from the install list,
see CHEF-1277.
diff --git a/bootstrap/recipes/client.rb b/bootstrap/recipes/client.rb
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+Chef::Log.warn("This recipe will be deprecated soon, please use chef::bootstrap_client")
+Chef::Log.warn("See the 'chef' cookbook's README.md for more information.")
+
 root_group = value_for_platform(
 "openbsd" =>{"default" => "wheel" },
 "freebsd" =>{"default" => "wheel" },
diff --git a/bootstrap/recipes/server.rb b/bootstrap/recipes/server.rb
@@ -21,6 +21,9 @@
 # limitations under the License.
 #
 
+Chef::Log.warn("This recipe will be deprecated soon, please use chef::bootstrap_server")
+Chef::Log.warn("See the 'chef' cookbook's README.md for more information.")
+
 root_group = value_for_platform(
 "openbsd" =>{"default" => "wheel" },
 "freebsd" =>{"default" => "wheel" },
diff --git a/chef/recipes/bootstrap_server.rb b/chef/recipes/bootstrap_server.rb
@@ -62,7 +62,7 @@
 include_recipe "zlib"
 include_recipe "xml"
 
-server_gems = %w{chef-server chef-server-api chef-solr }
+server_gems = %w{chef-server-api chef-solr }
 server_services = %w{chef-server chef-solr chef-solr-indexer }
 
 if node.chef.attribute?("webui_enabled")

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`	`# limitations under the License.`
`18`	`18`	`#`
`19`	`19`
	`20`	`+Chef::Log.warn("This recipe will be deprecated soon, please use chef::bootstrap_client")`
	`21`	`+Chef::Log.warn("See the 'chef' cookbook's README.md for more information.")`
	`22`	`+`
`20`	`23`	`root_group=value_for_platform(`
`21`	`24`	`"openbsd"=>{"default"=>"wheel"},`
`22`	`25`	`"freebsd"=>{"default"=>"wheel"},`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@`
`21`	`21`	`# limitations under the License.`
`22`	`22`	`#`
`23`	`23`
	`24`	`+Chef::Log.warn("This recipe will be deprecated soon, please use chef::bootstrap_server")`
	`25`	`+Chef::Log.warn("See the 'chef' cookbook's README.md for more information.")`
	`26`	`+`
`24`	`27`	`root_group=value_for_platform(`
`25`	`28`	`"openbsd"=>{"default"=>"wheel"},`
`26`	`29`	`"freebsd"=>{"default"=>"wheel"},`
-Original file line number
+Diff line change
 include_recipe"zlib"
 include_recipe"xml"
 -server_gems=%w{chef-serverchef-server-apichef-solr}
 +server_gems=%w{chef-server-apichef-solr}
 server_services=%w{chef-serverchef-solrchef-solr-indexer}
 ifnode.chef.attribute?("webui_enabled")