chef-provisioning 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c14634a9570d6cc3b5bab7825b0e93cb857da43c
-  data.tar.gz: 0b5ea043440b057512b117ec4a3fbca92426c322
+  metadata.gz: 8779389e38c408619ab78eefda047f78e5c1826a
+  data.tar.gz: 61a5f41ab6289315509f7151b9d8e52369a23b8c
 SHA512:
-  metadata.gz: 77fd9ffc61c385cd4bd21ecb4eaa22592244139844da0f2376d08671c5a8113fd4cd2285cbdea1f15eb422e598962933f8f5f07cf742550eb2847f644e9ffa78
-  data.tar.gz: 294bf1b3e6634eaa5a78b4f4dfd05abcfe7339553e911026e8c03f8cecf342fd4941df7e98fad68cc4e817c4c876a2f2540e56a029ee5463dbad0a0fcf30ee32
+  metadata.gz: 5ae3ba3ae5ec38f25ee0aa596d886c42be3a9c47c0c09e9790f03156bccf08989132ff91dfac06f75787ee7b655a804701fb79a66d9c709212977c481e8aeb2a
+  data.tar.gz: 7ba2b3c08365bccce537dc692913e0e753d096b09293b9fd024b6b31fb58bcea891076b819b483ee5d6fd9ad89f547f7d6584eeb5311ae8d79134a42ccf332c2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Chef Provisioning Changelog
 
+## 1.2.0 (5/27/2015)
+
+- Updating for newly introduced Socketless mode.  If the local chef-zero url is `chefzero://...` then we replace it with `http://...` on the target VM ([#337][])
+- Bumped winrm dependency to 1.3.0 ([#332][])
+
 ## 1.1.1 (4/19/2015)
 
 - Fixed undefined method on nil class error inside setup-convergence ([@tyler-ball][])
@@ -94,6 +99,7 @@
 ## 0.14 (8/18/2014)
 
 - FEATURE: Add the machine_image resource ([@jkeiser][], [@johnewart][]):
+
   ```ruby
   machine_image 'base' do
     machine_options :bootstrap_options => { :image_id => 'ami-1234798123431', :ssh_username => 'root' }
@@ -293,6 +299,8 @@
 [#316]: https://github.com/chef/chef-provisioning/issues/316
 [#317]: https://github.com/chef/chef-provisioning/issues/317
 [#321]: https://github.com/chef/chef-provisioning/issues/321
+[#332]: https://github.com/chef/chef-provisioning/issues/332
+[#337]: https://github.com/chef/chef-provisioning/issues/337
 [@MrMMorris]: https://github.com/MrMMorris
 [@causton1]: https://github.com/causton1
 [@chef]: https://github.com/chef

data/README.md

@@ -262,6 +262,12 @@ Kitchen
 
 Chef Provisioning also works with Test Kitchen, allowing you to test entire clusters, not just machines!  The repository for the kitchen-metal gem is https://github.com/doubt72/kitchen-metal.
 
+
+Fixing conflict with chef-zero 3.2.1 and ~> 4.0 
+-----------------------------------------------
+
+If you run into the error `Unable to activate cheffish-1.0.0, because chef-zero-3.2.1 conflicts with chef-zero (~> 4.0)` you'll need to update the version of the chef gem included in the ChefDK.  Follow the instructions @ [https://github.com/fnichol/chefdk-update-app](https://github.com/fnichol/chefdk-update-app) and update chef to ~>12.2.1 
+
 Bugs and The Plan
 -----------------
 

data/lib/chef/provider/machine_image.rb

@@ -61,16 +61,8 @@ class MachineImage < Chef::Provider::LWRPBase
 
     # 2. Create the image
     machine_options = new_machine_options
-    begin
-      new_driver.allocate_image(action_handler, image_spec, new_image_options,
-                                machine_provider.machine_spec, machine_options)
-    rescue ArgumentError
-      # Backcompat kludge - remove in later version.
-      Chef::Log.warn("Driver #{new_driver.driver_url} does not accept machine_options.  This will be deprecated before Provisioning 1.0.")
-      machine_provider.machine_spec.instance_eval { @machine_options = machine_options }
-      new_driver.allocate_image(action_handler, image_spec, new_image_options,
-                                machine_provider.machine_spec)
-    end
+    new_driver.allocate_image(action_handler, image_spec, new_image_options,
+                              machine_provider.machine_spec, machine_options)
     image_spec.driver_url ||= new_driver.driver_url
     image_spec.from_image ||= new_resource.from_image if new_resource.from_image
     image_spec.run_list   ||= machine_provider.machine_spec.node['run_list']

data/lib/chef/provisioning/convergence_strategy/precreate_chef_objects.rb

@@ -1,6 +1,7 @@
 require 'chef/provisioning/convergence_strategy'
 require 'pathname'
 require 'cheffish'
+require 'chef_zero/socketless_server_map'
 
 class Chef
 module Provisioning
@@ -187,6 +188,25 @@ module Provisioning
       end
 
       def client_rb_content(chef_server_url, node_name)
+        # Chef stores a 'port registry' of chef zero URLs.  If we set the remote host's
+        # chef_server_url to a `chefzero` url it will fail because it does not know
+        # about the workstation's chef zero server
+        uri = URI.parse(chef_server_url)
+        if uri.scheme == 'chefzero' && uri.host == 'localhost'
+          if !Chef::Config[:listen]
+            raise "The remote host is configured to access the local chefzero host, but " +
+              "the local chefzero host is not configured to listen.  Provide --listen or " +
+              "set `listen true` in the chef config."
+          end
+          # Once chef and chef-dk are using chef-zero which supports this, we can
+          # remove the else block and the if check
+          if ChefZero::SocketlessServerMap.respond_to?(:server_on_port)
+            chef_server_url = ChefZero::SocketlessServerMap.server_on_port(uri.port).url
+          else
+            chef_server_url = chef_server_url.gsub(/^chefzero/, 'http')
+          end
+        end
+
         ssl_verify_mode = convergence_options[:ssl_verify_mode]
         ssl_verify_mode ||= if chef_server_url.downcase.start_with?("https")
                               :verify_peer

data/lib/chef/provisioning/machine/unix_machine.rb

@@ -44,6 +44,9 @@ module Provisioning
 
         # Get remote checksum of file
         result = transport.execute("md5sum -b #{path}", :read_only => true)
+        unless result.exitstatus == 0
+          result = transport.execute("md5 -r #{path}", :read_only => true)
+        end
         result.error!
         remote_sum = result.stdout.split(' ')[0]
 

data/lib/chef/provisioning/transport/winrm.rb

@@ -86,14 +86,14 @@ $file.Close
         # If you can't pwd within 10 seconds, you can't pwd
         execute('pwd', :timeout => 10)
         true
-      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, ::WinRM::WinRMHTTPTransportError, ::WinRM::WinRMWebServiceError, ::WinRM::WinRMWSManFault
-        Chef::Log.debug("unavailable: network connection failed or broke: #{$!.inspect}")
-        disconnect
-        false
       rescue ::WinRM::WinRMAuthorizationError
         Chef::Log.debug("unavailable: winrm authentication error: #{$!.inspect} ")
         disconnect
         false
+      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, ::WinRM::WinRMError
+        Chef::Log.debug("unavailable: network connection failed or broke: #{$!.inspect}")
+        disconnect
+        false
       end
 
       def make_url_available_to_remote(local_url)

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.