diff options
| author | Tensibai <tensibai@iabis.net> | 2019-05-22 21:44:41 +0000 |
|---|---|---|
| committer | Marc Chamberland <mchamberland@pbsc.com> | 2019-05-23 15:00:38 -0400 |
| commit | aa28c4e17ef1044fda844f4e9fb19f0d8e2469a2 (patch) | |
| tree | f039e89e4b672250556685b4f042a8cdaef866b3 | |
| parent | 925c4c7d757404c7c68001bb928044cad0f5c2a8 (diff) | |
| download | chef-aa28c4e17ef1044fda844f4e9fb19f0d8e2469a2.tar.gz | |
Fix another occurence of chef-zero in local_mode.rb file
Signed-off-by: Tensibai <tensibai@iabis.net>
Signed-off-by: Marc Chamberland <mchamberland@pbsc.com>
| -rw-r--r-- | lib/chef/local_mode.rb | 3 | ||||
| -rw-r--r-- | spec/unit/policy_builder/policyfile_spec.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/local_mode.rb b/lib/chef/local_mode.rb index b78c84581b..fb41cf8b27 100644 --- a/lib/chef/local_mode.rb +++ b/lib/chef/local_mode.rb @@ -17,6 +17,7 @@ require_relative "config" require_relative "monkey_patches/webrick-utils" if Chef::Platform.windows? +require_relative "dist" class Chef module LocalMode @@ -78,7 +79,7 @@ class Chef local_mode_url = @chef_zero_server.local_mode_url - Chef::Log.info("Started chef-zero at #{local_mode_url} with #{@chef_fs.fs_description}") + Chef::Log.info("Started #{Chef::Dist::ZERO} at #{local_mode_url} with #{@chef_fs.fs_description}") Chef::Config.chef_server_url = local_mode_url end end diff --git a/spec/unit/policy_builder/policyfile_spec.rb b/spec/unit/policy_builder/policyfile_spec.rb index 1293d6ebc6..f22e2a74b3 100644 --- a/spec/unit/policy_builder/policyfile_spec.rb +++ b/spec/unit/policy_builder/policyfile_spec.rb @@ -150,7 +150,7 @@ describe Chef::PolicyBuilder::Policyfile do expect(initialize_pb.temporary_policy?).to be_falsey end - context "#{Chef::Dist::SOLOEXEC}" do + context "chef-solo" do before { Chef::Config[:solo_legacy_mode] = true } it "errors on create" do |