chef 13.0.118-universal-mingw32 → 13.1.31-universal-mingw32

data/acceptance/fips/.kitchen/fips-unit-functional-centos-6.yml

@@ -0,0 +1,7 @@
+---
+hostname: 127.0.0.1
+port: '2202'
+username: vagrant
+ssh_key: "/Users/thom/work/chef-branches/acceptance/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/private_key"
+last_action: setup
+last_error: Kitchen::ActionFailed

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/action_set_name

@@ -0,0 +1 @@
+1494421840

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/creator_uid

@@ -0,0 +1 @@
+503

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/id

@@ -0,0 +1 @@
+5c39c875-e48a-4713-8395-ce81caaa5c49

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/index_uuid

@@ -0,0 +1 @@
+1d7ba92c79fd49748601d7a18407bb02

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAzyT6pqNAatxWjoU54Ecok1Kgd74ND3Cdnf72Ib8JA9KC4Vbc
+3tRNZEfd+2usvoFFmaf6F1wGUFDbbgHQxQUbqUsr0daLcgLUM24nZzdxfOE7c/9D
+jHGAYA3uEFdFrqvF2tsKN+SszJ+u0GyDPNwP3ne9XLZNhAhn9ululGIG+rln2u3I
+lStfQzxmdyd1bP0gkBlQgiMK5ipghdjWSc8R1maAmhqs1lJAVCzT9pI2bStD93a2
+eokcncJSx9DRbnLvBBV8+KshOK8qfVrLLb/22E7nbI3PTHCJX72IzDWIDb9zxLF+
+BF0ybkZrhCQAIUmkm80tkwnkPh4d5lxW0ZI1AQIDAQABAoIBAHd8IiT66A572GXP
+TWokQbBxKeTIOKpeUFyxk/I1SpLs29f1jePu3FFq7w22t2cQFECk1yqgR3gOm/Qh
+kfYDk0gc90LMGZWDMjoUYSA1p/3bwbqQVLtvQRinEFpWrPgrVy59yLAi9NX3ihPp
+c+4oFfNCaHVRJvdxDd8sGT/4J4R5YTsIPtURJ8oj2opS5gkiGXPdIN9ftzjFpU1/
+/cxKpnLMQFuf+cyr7fBFX6HJhEUVO8fSEO2YaRds2xYt6e6enFv4E5IzW4ZjsZMT
+9OA4yHgDxfAJDX/Qm9dh76pvhtOo8/rQ9N87SQ1uV39IlI5kufI4CEOUWCIX1svZ
+tVa5SK0CgYEA/FW546VjClzyr8TQ19aUOzRpjsv05kXChaRAuSPKs9P97yUnbOhg
+LxvAExUs2ggr0UmyFa/sR/0QT1pT80SSnPKKIre3zSWtsDzw4QyHel93Asud2jo2
+wQnjbAKEGvpsLn6/vjWHwPBlZTnVmVCKKOMTp9r3y3KkNQ3M1rdR4F8CgYEA0ic3
+53lZFv0H0yM7BHd+sNy8U8QBLF0WLZKQRRng8eYjOqlenbkuLX+rnjvsH1ByxnKK
+qXLDvM/Xj3UzdYpFcjz2j/lFGEQfCY+nzcEMOFdAuSI79kjF5YJMPWKwv0Izw15U
+ny+qMF/j4ESvXQzqMs01wdtH3H6S+uUxjwLuZp8CgYASW6pKhZ3PAzQk1YzcJyBh
+rk5/tRb8KdcdIfYTgicdLi8rVuinY8CbrMksmj3JHw8RCuuJ6GKoWiD1pPy2liaU
+hJDINdWJd1RLniNoPCEfJhLigS3a0qFpKe8BzK0PyWhVeaM5k2ts/hBibPK9VL64
+eszTSXr9sjmAIqDkfjHWwQKBgGdrnXtwoINLqpohcF3WYKaxOo0OnHU0qkFrK0yW
+W7kvxI6N415DT5Jcjhyk6KLQeGto2wxgyisVLcQPrW9eyKZbkgtwZKx4eb2+0JnV
+MypW5ic1zcR6M8mqwdJDyy+UaNzwgzyDvIFp7z7jDloAjRDLJHVucIL2V2bZe/Yh
+PymJAoGBAJPEVICzGHpyO0VbqTcQ78w/ZpmnT7sb0Z3AadWAXvvyfFtOl5VZCDP5
+/zA1LXZzzpXWqrLa0k1a5B4gx011l1T+/L57Id89QYI7/lUo9vvWXEQ4pe78Cet1
+0OC7El5hM+iRw28GTkmFIcsFLHcMnWb5AaoVLdR+vnlDNZYuahEF
+-----END RSA PRIVATE KEY-----

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/.vagrant/machines/default/virtualbox/synced_folders

@@ -0,0 +1 @@
+{"virtualbox":{"/tmp/omnibus/cache":{"create":true,"guestpath":"/tmp/omnibus/cache","hostpath":"/Users/thom/.kitchen/cache","disabled":false,"__vagrantfile":true}}}

data/acceptance/fips/.kitchen/kitchen-vagrant/kitchen-fips-fips-unit-functional-centos-6/Vagrantfile

@@ -0,0 +1,11 @@
+Vagrant.configure("2") do |c|
+  c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
+  c.vm.box = "bento/centos-6.7"
+  c.vm.hostname = "fips-unit-functional-centos-6.vagrantup.com"
+  c.vm.synced_folder ".", "/vagrant", disabled: true
+  c.vm.synced_folder "/Users/thom/.kitchen/cache", "/tmp/omnibus/cache", create: true
+  c.vm.provider :virtualbox do |p|
+    p.customize ["modifyvm", :id, "--cpus", "2"]
+    p.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+end

data/acceptance/fips/.kitchen/logs/fips-unit-functional-centos-6.log

@@ -0,0 +1,80 @@
+I, [2017-05-10T15:03:48.473258 #47111]  INFO -- fips-unit-functional-centos-6: -----> Setting up <fips-unit-functional-centos-6>...
+I, [2017-05-10T15:03:48.477080 #47111]  INFO -- fips-unit-functional-centos-6: Finished setting up <fips-unit-functional-centos-6> (0m0.00s).
+I, [2017-05-10T15:03:48.477204 #47111]  INFO -- fips-unit-functional-centos-6: -----> Verifying <fips-unit-functional-centos-6>...
+I, [2017-05-10T15:03:48.478435 #47111]  INFO -- fips-unit-functional-centos-6: Preparing files for transfer
+I, [2017-05-10T15:03:48.847727 #47111]  INFO -- fips-unit-functional-centos-6: -----> Installing Busser (busser)
+I, [2017-05-10T15:03:50.055852 #47111]  INFO -- fips-unit-functional-centos-6: Fetching: thor-0.19.0.gem
+I, [2017-05-10T15:03:50.087844 #47111]  INFO -- fips-unit-functional-centos-6: Successfully installed thor-0.19.0
+I, [2017-05-10T15:03:50.107121 #47111]  INFO -- fips-unit-functional-centos-6: Fetching: busser-0.7.1.gem
+I, [2017-05-10T15:03:50.125831 #47111]  INFO -- fips-unit-functional-centos-6: Successfully installed busser-0.7.1
+I, [2017-05-10T15:03:50.125885 #47111]  INFO -- fips-unit-functional-centos-6: 2 gems installed
+I, [2017-05-10T15:03:50.130951 #47111]  INFO -- fips-unit-functional-centos-6: Installing Busser plugins: busser-bats busser-serverspec
+I, [2017-05-10T15:03:51.571888 #47111]  INFO -- fips-unit-functional-centos-6: Plugin bats installed (version 0.3.0)
+I, [2017-05-10T15:03:51.573933 #47111]  INFO -- fips-unit-functional-centos-6: -----> Running postinstall for bats plugin
+I, [2017-05-10T15:03:51.596806 #47111]  INFO -- fips-unit-functional-centos-6: Installed Bats to /tmp/verifier/vendor/bats/bin/bats
+I, [2017-05-10T15:03:52.382674 #47111]  INFO -- fips-unit-functional-centos-6: Plugin serverspec installed (version 0.5.10)
+I, [2017-05-10T15:03:52.386623 #47111]  INFO -- fips-unit-functional-centos-6: -----> Running postinstall for serverspec plugin
+I, [2017-05-10T15:03:52.860681 #47111]  INFO -- fips-unit-functional-centos-6: Suite path directory /tmp/verifier/suites does not exist, skipping.
+I, [2017-05-10T15:03:52.863957 #47111]  INFO -- fips-unit-functional-centos-6: Transferring files to <fips-unit-functional-centos-6>
+I, [2017-05-10T15:03:53.068651 #47111]  INFO -- fips-unit-functional-centos-6: -----> Running bats test suite
+I, [2017-05-10T15:03:53.160608 #47111]  INFO -- fips-unit-functional-centos-6: ERROR:  Can't find ruby library file or shared library chef
+I, [2017-05-10T15:03:53.168163 #47111]  INFO -- fips-unit-functional-centos-6: !!!!!! Command [/tmp/verifier/vendor/bats/bin/bats /tmp/verifier/suites/bats] exit code was 1
+E, [2017-05-10T15:03:53.171461 #47111] ERROR -- fips-unit-functional-centos-6: Verify failed on instance <fips-unit-functional-centos-6>.
+E, [2017-05-10T15:03:53.171547 #47111] ERROR -- fips-unit-functional-centos-6: ------Exception-------
+E, [2017-05-10T15:03:53.171564 #47111] ERROR -- fips-unit-functional-centos-6: Class: Kitchen::ActionFailed
+E, [2017-05-10T15:03:53.171574 #47111] ERROR -- fips-unit-functional-centos-6: Message: SSH exited (1) for command: [sh -c '
+TEST_KITCHEN="1"; export TEST_KITCHEN
+BUSSER_ROOT="/tmp/verifier"; export BUSSER_ROOT
+GEM_HOME="/tmp/verifier/gems"; export GEM_HOME
+GEM_PATH="/tmp/verifier/gems"; export GEM_PATH
+GEM_CACHE="/tmp/verifier/gems/cache"; export GEM_CACHE
+
+sudo -E /tmp/verifier/bin/busser test bats serverspec
+']
+E, [2017-05-10T15:03:53.171584 #47111] ERROR -- fips-unit-functional-centos-6: ----------------------
+E, [2017-05-10T15:03:53.171606 #47111] ERROR -- fips-unit-functional-centos-6: ------Backtrace-------
+E, [2017-05-10T15:03:53.171618 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/verifier/base.rb:80:in `rescue in call'
+E, [2017-05-10T15:03:53.171627 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/verifier/base.rb:83:in `call'
+E, [2017-05-10T15:03:53.171636 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:434:in `block in verify_action'
+E, [2017-05-10T15:03:53.171645 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:527:in `synchronize_or_call'
+E, [2017-05-10T15:03:53.171653 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:489:in `block in action'
+E, [2017-05-10T15:03:53.171662 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/2.4.0/benchmark.rb:293:in `measure'
+E, [2017-05-10T15:03:53.171670 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:488:in `action'
+E, [2017-05-10T15:03:53.171678 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:426:in `verify_action'
+E, [2017-05-10T15:03:53.171686 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:359:in `block in transition_to'
+E, [2017-05-10T15:03:53.171695 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:358:in `each'
+E, [2017-05-10T15:03:53.171703 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:358:in `transition_to'
+E, [2017-05-10T15:03:53.171711 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:157:in `verify'
+E, [2017-05-10T15:03:53.171720 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:197:in `public_send'
+E, [2017-05-10T15:03:53.171728 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:197:in `run_action_in_thread'
+E, [2017-05-10T15:03:53.171736 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:169:in `block (2 levels) in run_action'
+E, [2017-05-10T15:03:53.171745 #47111] ERROR -- fips-unit-functional-centos-6: ----End Backtrace-----
+E, [2017-05-10T15:03:53.171752 #47111] ERROR -- fips-unit-functional-centos-6: ---Nested Exception---
+E, [2017-05-10T15:03:53.171760 #47111] ERROR -- fips-unit-functional-centos-6: Class: Kitchen::Transport::SshFailed
+E, [2017-05-10T15:03:53.171768 #47111] ERROR -- fips-unit-functional-centos-6: Message: SSH exited (1) for command: [sh -c '
+TEST_KITCHEN="1"; export TEST_KITCHEN
+BUSSER_ROOT="/tmp/verifier"; export BUSSER_ROOT
+GEM_HOME="/tmp/verifier/gems"; export GEM_HOME
+GEM_PATH="/tmp/verifier/gems"; export GEM_PATH
+GEM_CACHE="/tmp/verifier/gems/cache"; export GEM_CACHE
+
+sudo -E /tmp/verifier/bin/busser test bats serverspec
+']
+E, [2017-05-10T15:03:53.171776 #47111] ERROR -- fips-unit-functional-centos-6: ----------------------
+E, [2017-05-10T15:03:53.171784 #47111] ERROR -- fips-unit-functional-centos-6: ------Backtrace-------
+E, [2017-05-10T15:03:53.171799 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/verifier/base.rb:80:in `rescue in call'
+E, [2017-05-10T15:03:53.171810 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/verifier/base.rb:83:in `call'
+E, [2017-05-10T15:03:53.171818 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:434:in `block in verify_action'
+E, [2017-05-10T15:03:53.171826 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:527:in `synchronize_or_call'
+E, [2017-05-10T15:03:53.171835 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:489:in `block in action'
+E, [2017-05-10T15:03:53.171843 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/2.4.0/benchmark.rb:293:in `measure'
+E, [2017-05-10T15:03:53.171851 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:488:in `action'
+E, [2017-05-10T15:03:53.171859 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:426:in `verify_action'
+E, [2017-05-10T15:03:53.171867 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:359:in `block in transition_to'
+E, [2017-05-10T15:03:53.171900 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:358:in `each'
+E, [2017-05-10T15:03:53.171908 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:358:in `transition_to'
+E, [2017-05-10T15:03:53.171916 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/instance.rb:157:in `verify'
+E, [2017-05-10T15:03:53.171924 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:197:in `public_send'
+E, [2017-05-10T15:03:53.171932 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:197:in `run_action_in_thread'
+E, [2017-05-10T15:03:53.171941 #47111] ERROR -- fips-unit-functional-centos-6: /Users/thom/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/test-kitchen-1.16.0/lib/kitchen/command.rb:169:in `block (2 levels) in run_action'
+E, [2017-05-10T15:03:53.171949 #47111] ERROR -- fips-unit-functional-centos-6: ----End Backtrace-----

data/acceptance/fips/.kitchen/logs/kitchen.log

@@ -0,0 +1,4 @@
+E, [2017-05-10T15:04:42.172669 #47139] ERROR -- Kitchen: 
+No instances for regex `', try running `kitchen list'
+
+

data/chef.gemspec

@@ -57,6 +57,6 @@ Gem::Specification.new do |s|
   s.bindir       = "bin"
   s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
 
-  s.require_paths = %w{ lib lib-backcompat }
+  s.require_paths = %w{ lib }
   s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
 end

data/lib/chef/application/client.rb

@@ -286,7 +286,7 @@ class Chef::Application::Client < Chef::Application
   option :listen,
     :long           => "--[no-]listen",
     :description    => "Whether a local mode (-z) server binds to a port",
-    :boolean        => true
+    :boolean        => false
 
   option :fips,
     :long         => "--[no-]fips",

data/lib/chef/application/knife.rb

@@ -132,7 +132,7 @@ class Chef::Application::Knife < Chef::Application
   option :listen,
     :long           => "--[no-]listen",
     :description    => "Whether a local mode (-z) server binds to a port",
-    :boolean        => true
+    :boolean        => false
 
   option :version,
     :short        => "-v",

data/lib/chef/application/solo.rb

@@ -257,6 +257,7 @@ class Chef::Application::Solo < Chef::Application
       end
 
       Chef::Config[:local_mode] = true
+      Chef::Config[:listen] = false
     else
       configure_legacy_mode!
     end

data/lib/chef/cookbook/remote_file_vendor.rb

@@ -62,7 +62,7 @@ class Chef
         # If the checksums are different between on-disk (current) and on-server
         # (remote, per manifest), do the update. This will also execute if there
         # is no current checksum.
-        if current_checksum != found_manifest_record["checksum"]
+        if found_manifest_record[:lazy] || current_checksum != found_manifest_record["checksum"]
           raw_file = @rest.streaming_request(found_manifest_record[:url])
 
           Chef::Log.debug("Storing updated #{cache_filename} in the cache.")

data/lib/chef/cookbook/synchronizer.rb

@@ -71,6 +71,8 @@ class Chef
 
       @cookbook_full_file_paths = {}
       @remove_obsoleted_files = true
+
+      @lazy_files = {}
     end
 
     def cache
@@ -98,15 +100,22 @@ class Chef
     end
 
     def files
-      exclude = unless Chef::Config[:no_lazy_load]
-                  [ :files, :templates ]
-                else
-                  []
-                end
+      lazy = unless Chef::Config[:no_lazy_load]
+               %w{ files templates }
+             else
+               []
+             end
 
       @files ||= cookbooks.inject([]) do |memo, cookbook|
-        cookbook.each_file(excluded_parts: exclude) do |manifest_record|
-          memo << CookbookFile.new(cookbook, manifest_record)
+        cookbook.each_file do |manifest_record|
+          part = manifest_record[:name].split("/")[0]
+          if lazy.include?(part)
+            manifest_record[:lazy] = true
+            @lazy_files[cookbook] ||= []
+            @lazy_files[cookbook] << manifest_record
+          else
+            memo << CookbookFile.new(cookbook, manifest_record)
+          end
         end
         memo
       end
@@ -230,6 +239,10 @@ class Chef
       @cookbook_full_file_paths.each do |cookbook, full_paths|
         cookbook.all_files = full_paths
       end
+
+      @lazy_files.each do |cookbook, lazy_files|
+        cookbook.cookbook_manifest.add_files_to_manifest(lazy_files)
+      end
     end
 
     def ensure_cookbook_paths

data/lib/chef/cookbook_manifest.rb

@@ -160,6 +160,14 @@ class Chef
       @manifest_records_by_path = extract_manifest_records_by_path(@manifest)
     end
 
+    # @api private
+    # takes a list of hashes
+    def add_files_to_manifest(files)
+      manifest[:all_files].concat(Array(files))
+      @checksums = extract_checksums_from_manifest(@manifest)
+      @manifest_records_by_path = extract_manifest_records_by_path(@manifest)
+    end
+
     def files_for(part)
       return root_files if part.to_s == "root_files"
       manifest[:all_files].select do |file|

data/lib/chef/deprecated.rb

@@ -238,6 +238,16 @@ class Chef
       end
     end
 
+    class LocalListen < Base
+      def id
+        18
+      end
+
+      def target
+        "local_listen.html"
+      end
+    end
+
     # id 3694 was deleted
 
     class Generic < Base

data/lib/chef/knife/client_key_create.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_create"
 require "chef/knife/key_create_base"
 
 class Chef
@@ -30,6 +31,8 @@ class Chef
     class ClientKeyCreate < Knife
       include Chef::Knife::KeyCreateBase
 
+      banner "knife client key create CLIENT (options)"
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/client_key_delete.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_delete"
 
 class Chef
   class Knife

data/lib/chef/knife/client_key_edit.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_edit"
 require "chef/knife/key_edit_base"
 
 class Chef

data/lib/chef/knife/client_key_list.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_list"
 require "chef/knife/key_list_base"
 
 class Chef

data/lib/chef/knife/client_key_show.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_show"
 
 class Chef
   class Knife

data/lib/chef/knife/user_key_create.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_create"
 require "chef/knife/key_create_base"
 
 class Chef

data/lib/chef/knife/user_key_delete.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_delete"
 
 class Chef
   class Knife

data/lib/chef/knife/user_key_edit.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_edit"
 require "chef/knife/key_edit_base"
 
 class Chef

data/lib/chef/knife/user_key_list.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_list"
 require "chef/knife/key_list_base"
 
 class Chef

data/lib/chef/knife/user_key_show.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_show"
 
 class Chef
   class Knife

data/lib/chef/local_mode.rb

@@ -73,6 +73,7 @@ class Chef
         @chef_zero_server = ChefZero::Server.new(server_options)
 
         if Chef::Config[:listen]
+          Chef.deprecated(:local_listen, "Starting local-mode server in deprecated socket mode")
           @chef_zero_server.start_background
         else
           @chef_zero_server.start_socketless

data/lib/chef/mixin/which.rb

@@ -25,7 +25,7 @@ class Chef
       def where(*cmds, extra_path: nil, &block)
         # NOTE: unnecessarily duplicates function of path_sanity
         extra_path ||= [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
-        paths = env_path.split(File::PATH_SEPARATOR) + extra_path
+        paths = env_path.split(File::PATH_SEPARATOR) + Array(extra_path)
         cmds.map do |cmd|
           paths.map do |path|
             filename = Chef.path_to(File.join(path, cmd))

data/lib/chef/platform/service_helpers.rb

@@ -69,7 +69,7 @@ class Chef
           configs = []
 
           if ::File.exist?(Chef.path_to("/etc/init.d/#{service_name}"))
-            configs << :initd
+            configs += [ :initd, :systemd ]
           end
 
           if ::File.exist?(Chef.path_to("/etc/init/#{service_name}.conf"))

data/lib/chef/provider/apt_repository.rb

@@ -33,6 +33,9 @@ class Chef
         which("apt-get")
       end
 
+      LIST_APT_KEYS = "apt-key list".freeze
+      LIST_APT_KEY_FINGERPRINTS = "apt-key adv --list-public-keys --with-fingerprint --with-colons".freeze
+
       def load_current_resource
       end
 
@@ -143,7 +146,7 @@ class Chef
       def no_new_keys?(file)
         # Now we are using the option --with-colons that works across old os versions
         # as well as the latest (16.10). This for both `apt-key` and `gpg` commands
-        installed_keys = extract_fingerprints_from_cmd("apt-key adv --list-public-keys --with-fingerprint --with-colons")
+        installed_keys = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS)
         proposed_keys = extract_fingerprints_from_cmd("gpg --with-fingerprint --with-colons #{file}")
         (installed_keys & proposed_keys).sort == proposed_keys.sort
       end
@@ -194,15 +197,15 @@ class Chef
           command cmd
           sensitive new_resource.sensitive
           not_if do
-            present = extract_fingerprints_from_cmd("apt-key finger").any? do |fp|
+            present = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS).any? do |fp|
               fp.end_with? key.upcase
             end
-            present && key_is_valid?("apt-key list", key.upcase)
+            present && key_is_valid?(LIST_APT_KEYS, key.upcase)
           end
           notifies :run, "execute[apt-cache gencaches]", :immediately
         end
 
-        raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?("apt-key list", key.upcase)
+        raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(LIST_APT_KEYS, key.upcase)
       end
 
       def install_ppa_key(owner, repo)