fixup legacy mode deprecation

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 0d0b6dd216..d166ef2dc8 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -56,6 +56,6 @@ class Chef::Application::Solo < Chef::Application::Base
 
   def run
     super
-    # Chef.deprecated(:solo_legacy_mode, "Solo legacy mode is deprecated FIXME WORDS");
+    Chef.deprecated(:solo_legacy_mode, "#{Chef::Dist::SOLOEXEC} --legacy-mode is deprecated and will be removed in #{Chef::Dist::PRODUCT} 16 (April 2020)")
   end
 end
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index b1763da1f0..42287998fc 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -45,7 +45,7 @@ describe "chef-client" do
   # we're running `chef-client` from the source tree and not the external one.
   # cf. CHEF-4914
   let(:chef_client) { "bundle exec #{Chef::Dist::CLIENT} --minimal-ohai" }
-  let(:chef_solo) { "bundle exec #{Chef::Dist::SOLOEXEC} --legacy-mode --minimal-ohai" }
+  let(:chef_solo) { "bundle exec #{Chef::Dist::SOLOEXEC} --minimal-ohai" }
 
   when_the_repository "has a cookbook with a no-op recipe" do
     before { file "cookbooks/x/recipes/default.rb", "" }
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb
index 451943e225..b28d4d0cd7 100644
--- a/spec/integration/solo/solo_spec.rb
+++ b/spec/integration/solo/solo_spec.rb
@@ -17,7 +17,7 @@ describe Chef::Dist::SOLOEXEC do
 
   let(:cookbook_ancient_100_metadata_rb) { cb_metadata("ancient", "1.0.0") }
 
-  let(:chef_solo) { "bundle exec #{Chef::Dist::SOLOEXEC} --legacy-mode --minimal-ohai" }
+  let(:chef_solo) { "bundle exec #{Chef::Dist::SOLOEXEC} --minimal-ohai" }
 
   when_the_repository "creates nodes" do
     let(:nodes_dir) { File.join(@repository_dir, "nodes") }
@@ -116,7 +116,7 @@ describe Chef::Dist::SOLOEXEC do
         file_cache_path "#{path_to("config/cache")}"
       EOM
       result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
-      expect(result.exitstatus).to eq(0) # For CHEF-5120 this becomes 1
+      expect(result.exitstatus).to eq(1)
       expect(result.stdout).to include("WARN: MissingCookbookDependency")
     end
   end