chef-provisioning 0.19 → 0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d07c9ee156834b006ec670fa2ad4f9fdaa467d
-  data.tar.gz: 746b88dd6944cdf449513dee69ef5c8bbfdb91a8
+  metadata.gz: cef7f76f812dd3448e17029ab8f1a6ad7e6fbae0
+  data.tar.gz: c4eb855e69e250a2116b0cf76c86c9564f289e6d
 SHA512:
-  metadata.gz: bf65fd08788dcb554a21f2cf75d7284bbe4e030abb2ea96d13b108e2f9be7a5f88927d2eafcc430746c5092888438eb2e4dfea32f2767242e99c1462c7744bac
-  data.tar.gz: aa704ae71a32b3fd590d16e848a62d01d048c10570f5b60780da65da590aa54901fa5464572d3784f7451646e5901758b99eff47db14d7de59e479b3cef16fe3
+  metadata.gz: 84b90c58824627cfa6e867e6ec5bd6a4bd9537eabc2713206efcebb8132b30baf1eeb81baa21088ef901d2f411d1f7ed3fcb3d17a0ce969a9e49a720f24407ed
+  data.tar.gz: 9314c432528799c4f75b9d9821e1d9ce64dceecdb1ede33247b4c3b56d3f7e88ad7ed2b2e81002106a13a17c0b423cfeb49f1540aee09d2480b660e367a3877c

data/CHANGELOG.md

@@ -1,29 +1,33 @@
 # Chef Provisioning Changelog
 
+## 0.20 (2/25/2015)
+
+- Marking machines `nil` in a load_balancer does not affect existing machines ([#299][])
+- `with_driver` now optionally accepts a block.  If passed, it is only active in that block.  If not passed, existing behavior is unchanged.  ([#296][])
+- New `show_output` attribute for `machine_execute`, defaults to false ([@causton1][])
+- Changed `MachineSpec` storage to `ManagedEntry`.  Driver authors, see PR for details ([#297][])
+- If specifying exact chef version, don't re-install every chef-provisioning ([#303][])
+
 ## 0.19 (2/25/2015)
 
 - Support for different versions of Chef with the :chef_version and :prerelease arguments (`machine_options convergence_options: { chef_version: '12.0.1' }` or `prerelease: true`)
-- Support HTTPS proxy (@causton1)
+- Support HTTPS proxy ([@causton1][])
 - Automatically configure HTTPS proxy when specifying `machine_options convergence_options: { http_proxy: '...' }`
 - Support for arbitrary configuration using `machine_options convergence_options: { chef_config: "anything you want dumped in /etc/chef/client.rb (will be appended to the standard options already placed in the file)" }`
 
-- Make load_balancer :destroy work (@lynchc)
-- Default to SSL for Chef install download (@xeon22)
-- Fix Chef overwriting attributes on first converge in `machine_batch` (#209)
-- Fix node permissions on Hosted / Enterprise Chef: no more adding your clients to the `admins` group (ewww).  (#59)
-- Always pass an array (never nil) to the driver, even when there are no machines to add to it (partial fix for chef/chef-provisioning-aws#81)
--
-
-
-915eac3 (origin/jk/install-sh-version, jk/install-sh-version) Add chef_version, prerelease and install_sh_arguments to InstallSh
+- Make load_balancer :destroy work ([@lynchc][])
+- Default to SSL for Chef install download ([@xeon22][])
+- Fix Chef overwriting attributes on first converge in `machine_batch` ([#209][])
+- Fix node permissions on Hosted / Enterprise Chef: no more adding your clients to the `admins` group (ewww).  ([#59][])
+- Always pass an array (never nil) to the driver, even when there are no machines to add to it (partial fix for chef/chef-provisioning-aws[#81][])
 
 ## 0.18 (1/27/2015)
 
-- Allow `ssl_verify_mode` to be overridden (@mivok)
-- Support `machine_options[:convergence_options][:bootstrap_proxy]` (@mivok)
-- Allow `machine_options[:ssh_gateway]` without username (no @) (@mivok)
+- Allow `ssl_verify_mode` to be overridden ([@mivok][])
+- Support `machine_options[:convergence_options][:bootstrap_proxy]` ([@mivok][])
+- Allow `machine_options[:ssh_gateway]` without username (no @) ([@mivok][])
 - Fix issue with net-ssh 2.9.2
-- Add `action :destroy` to `machine_image` (@miguelcnf)
+- Add `action :destroy` to `machine_image` ([@miguelcnf][])
 
 ## 0.17 (12/17/2014)
 
@@ -68,7 +72,7 @@
 
 ## 0.14 (8/18/2014)
 
-- FEATURE: Add the machine_image resource (@jkeiser, @johnewart):
+- FEATURE: Add the machine_image resource ([@jkeiser][], [@johnewart][]):
   ```ruby
   machine_image 'base' do
     machine_options :bootstrap_options => { :image_id => 'ami-1234798123431', :ssh_username => 'root' }
@@ -104,7 +108,7 @@
   - Creates a node with the name of the machine_image, which contains metadata
     like the username of the image.  This makes things like AWS image registries
     possible.
-- Fix the no_converge convergence strategy (@johnewart)
+- Fix the no_converge convergence strategy ([@johnewart][])
 - SSH port forwarding improvements:
   - Detects *any* IP on the localhost and forwards it--not just 127.0.0.1
   - Binds to localhost on the remote side instead of 127.0.0.1, allowing for IPv6 communication
@@ -114,8 +118,8 @@
 
 ## 0.13 (6/17/2014)
 
-- make winrm work again (@mwrock)
-- add bootstrap_proxy as a convergence_option for when target machines require a proxy (@MrMMorris)
+- make winrm work again ([@mwrock][])
+- add bootstrap_proxy as a convergence_option for when target machines require a proxy ([@MrMMorris][])
 
 ## 0.12.1 (6/18/2014)
 
@@ -125,8 +129,8 @@
 ## 0.12 (6/18/2014)
 
 - Remove chef-provisioning-fog and chef-provisioning-vagrant as dependencies (install whatever things you want directly!)
-- Fix ssl_verify_mode to work correctly when other HTTPS calls are made (@mwrock)
-- Fix machine_file and machine_execute resources (@irvingpop)
+- Fix ssl_verify_mode to work correctly when other HTTPS calls are made ([@mwrock][])
+- Fix machine_file and machine_execute resources ([@irvingpop][])
 
 ## 0.11.2 (6/4/2014)
 
@@ -143,8 +147,8 @@
 - get rid of annoying SSL warning (note: this turns off SSL verification, which was the default anyway)
 - fix machine_batch error report to be less verbose
 - fail when machine is being moved from driver to driver
-- @marcusn disconnect from SSH when there is a problem
-- fix SSH gateway code to honor any options given (@marcusn)
+- [@marcusn][] disconnect from SSH when there is a problem
+- fix SSH gateway code to honor any options given ([@marcusn][])
 - Make machine_batch auto batching smarter (only batch things that have the same actions)
 - Allow auto batching to be turned off with `auto_batch_machines = false` in recipes or config
 - Allow this:
@@ -197,8 +201,8 @@
 ## 0.9 (4/9/2014)
 
 - Add `files` and `file` attributes to the `machine` resource
-- Fix `machine_execute` resource (@irvingpop)
-- Fix `machine :converge` action (thanks @double-z)
+- Fix `machine_execute` resource ([@irvingpop][])
+- Fix `machine :converge` action (thanks [@double-z][])
 - Make chef-client timeout longer by default (2 hours)
 - Make chef_client_timeout a configurable option for all convergence strategies and provisioner_options
 - Add `metal cp` command
@@ -207,7 +211,7 @@
 
 - Add timeout support to execute
 - Fix machine_file resource
-- Add ohai_hints DSL to machine resource (@xorl)
+- Add ohai_hints DSL to machine resource ([@xorl][])
 
 ## 0.8.1 (4/9/2014)
 
@@ -219,7 +223,7 @@
 
 ## 0.8 (4/8/2014)
 
-- New machine_execute resource! (irving@chef.io)
+- New machine_execute resource! (irving[@chef][].io)
 - Experimental "metal" command line: metal execute NODENAME COMMAND ARGS
 - Transport: Add ability to stream execute() for better nested chef-client debugging
 
@@ -234,23 +238,49 @@
 
 ## 0.5 (4/3/2014)
 
-* Provisioner interface changes designed to allow provisioners to be used outside of Chef (doubt@chef.io)
+* Provisioner interface changes designed to allow provisioners to be used outside of Chef (doubt[@chef][].io)
   * All Provisioner and Machine methods now take "action_handler" instead of "driver."  It uses the ActionHandler interface described in action_handler.rb.  In short:
     - driver.run_context -> action_handler.recipe_context
     - driver.updated_by_last_action(true) -> action_handler.updated!
     - driver.converge_by -> action_handler.perform_action
     - driver.cookbook_name -> driver.debug_name
   * Convergence strategy: delete_chef_objects() -> cleanup_convergence()
-* Ability to get back to a machine from a node (another Provisioner interface change) (doubt@chef.io):
+* Ability to get back to a machine from a node (another Provisioner interface change) (doubt[@chef][].io):
   * Provisioners must create a file named `chef_provisioning/provisioner_init/<scheme>_init.rb`.  It will be required when a node is encountered with that scheme.  It should call Chef::Provisioning.add_registered_provisioner_class(<scheme>, <provisioner class name>).  For the provisioner_url `fog:AWS:21348723432`, the scheme is "fog" and the file is `chef_provisioningprovisioner_init/fog_init.rb`.  It should call `Chef::Provisioning.add_registered_provisioner_class('fog', Chef::Provisioning::Provisioner::FogProvisioner)`.
   * Provisioner classes must implement the class method `inflate(node)`, which should create a Provisioner instance appropriate to the given `node` (generally by looking at `node['normal']['provisioner_output']`)
 * New `NoConverge` convergence strategy that creates a node but does not install Chef or converge.
-* Support for machine_file `group`, `owner` and `mode` attributes (@irvingpop)
-* SSH transport (ryan@segv.net): try to enable pty when possible (increases chance of successful connection).  Set options[:ssh_pty_enable] to `false` to turn this off.  Set `true` to force it (and fail if we can't get it)
+* Support for machine_file `group`, `owner` and `mode` attributes ([@irvingpop][])
+* SSH transport (ryan[@segv][].net): try to enable pty when possible (increases chance of successful connection).  Set options[:ssh_pty_enable] to `false` to turn this off.  Set `true` to force it (and fail if we can't get it)
 
 ## 0.4 (3/29/2014)
 
 * EC2: Make it possible for multiple IAM users to converge chef-provisioning on the same account
-* Openstack: Openstack support via the Fog driver! (@cstewart87)
-* EC2: Add :use_private_ip_for_ssh option, and use private ip by default if public IP does not exist.  (@xorl, @dafyddcrosby)
+* Openstack: Openstack support via the Fog driver! ([@cstewart87][])
+* EC2: Add :use_private_ip_for_ssh option, and use private ip by default if public IP does not exist.  ([@xorl][], [@dafyddcrosby][])
 * RHEL/Centos: fix platform detection and installation
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#59]: https://github.com/chef/chef-provisioning/issues/59
+[#81]: https://github.com/chef/chef-provisioning/issues/81
+[#209]: https://github.com/chef/chef-provisioning/issues/209
+[#296]: https://github.com/chef/chef-provisioning/issues/296
+[#297]: https://github.com/chef/chef-provisioning/issues/297
+[#299]: https://github.com/chef/chef-provisioning/issues/299
+[#303]: https://github.com/chef/chef-provisioning/issues/303
+[@MrMMorris]: https://github.com/MrMMorris
+[@causton1]: https://github.com/causton1
+[@chef]: https://github.com/chef
+[@cstewart87]: https://github.com/cstewart87
+[@dafyddcrosby]: https://github.com/dafyddcrosby
+[@double-z]: https://github.com/double-z
+[@irvingpop]: https://github.com/irvingpop
+[@jkeiser]: https://github.com/jkeiser
+[@johnewart]: https://github.com/johnewart
+[@lynchc]: https://github.com/lynchc
+[@marcusn]: https://github.com/marcusn
+[@miguelcnf]: https://github.com/miguelcnf
+[@mivok]: https://github.com/mivok
+[@mwrock]: https://github.com/mwrock
+[@segv]: https://github.com/segv
+[@xeon22]: https://github.com/xeon22
+[@xorl]: https://github.com/xorl

data/lib/chef/provider/load_balancer.rb

@@ -2,7 +2,6 @@ require 'chef/provider/lwrp_base'
 require 'chef/provider/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
-require 'chef/provisioning/chef_load_balancer_spec'
 
 class Chef
   class Provider
@@ -20,12 +19,17 @@ class Chef
         @new_driver ||= run_context.chef_metal.driver_for(new_resource.driver)
       end
 
+      def chef_managed_entry_store
+        @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+      end
+
       action :create do
-        lb_spec = Chef::Provisioning::ChefLoadBalancerSpec.get(new_resource.name) ||
-                  Chef::Provisioning::ChefLoadBalancerSpec.empty(new_resource.name)
+        lb_spec = chef_managed_entry_store.get_or_new(:load_balancer, new_resource.name)
 
         Chef::Log.debug "Creating load balancer: #{new_resource.name}; loaded #{lb_spec.inspect}"
-        machine_specs = new_resource.machines ? new_resource.machines.map { |machine| get_machine_spec(machine) } : []
+        if new_resource.machines
+          machine_specs = new_resource.machines.map { |machine| get_machine_spec!(machine) }
+        end
 
         new_driver.allocate_load_balancer(action_handler, lb_spec, lb_options, machine_specs)
         lb_spec.save(action_handler)
@@ -33,14 +37,17 @@ class Chef
       end
 
       action :destroy do
-        lb_spec = Chef::Provisioning::ChefLoadBalancerSpec.get(new_resource.name)
-        new_driver.destroy_load_balancer(action_handler, lb_spec, lb_options)
+        lb_spec = chef_managed_entry_store.get(:load_balancer, new_resource.name)
+        if lb_spec
+          new_driver.destroy_load_balancer(action_handler, lb_spec, lb_options)
+        end
       end
 
       private
-      def get_machine_spec(machine_name)
+
+      def get_machine_spec!(machine_name)
         Chef::Log.debug "Getting machine spec for #{machine_name}"
-        Chef::Provisioning::ChefMachineSpec.get(machine_name)
+        Provisioning.chef_managed_entry_store(new_resource.chef_server).get!(:machine, machine_name)
       end
 
       def lb_options
@@ -50,3 +57,6 @@ class Chef
     end
   end
 end
+
+require 'chef/provisioning/chef_managed_entry_store'
+Chef::Provisioning::ChefManagedEntryStore.type_names_for_backcompat[:load_balancer] = "loadbalancers"

data/lib/chef/provider/machine.rb

@@ -2,7 +2,6 @@ require 'chef/provider/lwrp_base'
 require 'chef/provider/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
-require 'chef/provisioning/chef_machine_spec'
 
 class Chef
 class Provider
@@ -11,6 +10,9 @@ class Machine < Chef::Provider::LWRPBase
   def action_handler
     @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
   end
+  def action_handler=(value)
+    @action_handler = value
+  end
 
   use_inline_resources
 
@@ -26,6 +28,8 @@ class Machine < Chef::Provider::LWRPBase
       raise "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
     end
     new_driver.allocate_machine(action_handler, machine_spec, new_machine_options)
+    machine_spec.from_image ||= new_resource.from_image if new_resource.from_image
+    machine_spec.driver_url ||= new_driver.driver_url
     machine_spec.save(action_handler)
   end
 
@@ -107,7 +111,7 @@ class Machine < Chef::Provider::LWRPBase
   def from_image_spec
     @from_image_spec ||= begin
       if new_resource.from_image
-        Chef::Provisioning::ChefImageSpec.get(new_resource.from_image, new_resource.chef_server)
+        chef_managed_entry_store.get!(:machine_image, new_resource.from_image)
       else
         nil
       end
@@ -125,10 +129,6 @@ class Machine < Chef::Provider::LWRPBase
   def machine_options(driver)
     configs = []
 
-    if from_image_spec && from_image_spec.machine_options
-      configs << from_image_spec.machine_options
-    end
-
     configs << {
       :convergence_options =>
         [ :chef_server,
@@ -155,7 +155,11 @@ class Machine < Chef::Provider::LWRPBase
     node_driver.load_current_resource
     json = node_driver.new_json
     json['normal']['chef_provisioning'] = node_driver.current_json['normal']['chef_provisioning']
-    @machine_spec = Chef::Provisioning::ChefMachineSpec.new(json, new_resource.chef_server)
+    @machine_spec = chef_managed_entry_store.new_entry(:machine, new_resource.name, json)
+  end
+
+  def chef_managed_entry_store
+    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
   end
 
   def self.upload_files(action_handler, machine, files)

data/lib/chef/provider/machine_batch.rb

@@ -4,7 +4,6 @@ require 'chef/provider/machine'
 require 'chef/provisioning/chef_provider_action_handler'
 require 'chef/provisioning/add_prefix_action_handler'
 require 'chef/provisioning/machine_spec'
-require 'chef/provisioning/chef_machine_spec'
 
 class Chef
 class Provider
@@ -28,6 +27,8 @@ class MachineBatch < Chef::Provider::LWRPBase
     by_new_driver.each do |driver, specs_and_options|
       driver.allocate_machines(action_handler, specs_and_options, parallelizer) do |machine_spec|
         m = by_id[machine_spec.id]
+        machine_spec.from_image ||= m[:resource].from_image if m[:resource] && m[:resource].from_image
+        machine_spec.driver_url ||= driver.driver_url
         machine_spec.save(m[:action_handler])
       end
     end
@@ -168,7 +169,7 @@ class MachineBatch < Chef::Provider::LWRPBase
           :machine_options => proc { |driver| provider.machine_options(driver) },
           :action_handler => Provisioning::AddPrefixActionHandler.new(action_handler, "[#{machine_resource.name}] ")
         }
-      elsif machine.is_a?(Provisioning::MachineSpec)
+      elsif machine.is_a?(Provisioning::ManagedEntry)
         machine_spec = machine
         {
           :spec => machine_spec,
@@ -179,8 +180,7 @@ class MachineBatch < Chef::Provider::LWRPBase
         }
       else
         name = machine
-        machine_spec = Provisioning::ChefMachineSpec.get(name, new_resource.chef_server) ||
-                       Provisioning::ChefMachineSpec.empty(name, new_resource.chef_server)
+        machine_spec = chef_managed_entry_store.get_or_new(:machine, name)
         {
           :spec => machine_spec,
           :desired_driver => new_resource.driver,
@@ -192,6 +192,10 @@ class MachineBatch < Chef::Provider::LWRPBase
     end.to_a
   end
 
+  def chef_managed_entry_store
+    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+  end
+
   def machine_options(driver)
     result = { :convergence_options => { :chef_server => new_resource.chef_server } }
     result = Chef::Mixin::DeepMerge.hash_only_merge(result, run_context.chef_provisioning.config[:machine_options]) if run_context.chef_provisioning.config[:machine_options]

data/lib/chef/provider/machine_execute.rb

@@ -27,7 +27,7 @@ class MachineExecute < Chef::Provider::LWRPBase
   end
 
   action :run do
-    machine.execute(action_handler, new_resource.command)
+    machine.execute(action_handler, new_resource.command, :stream => new_resource.live_stream)
   end
 
 end

data/lib/chef/provider/machine_image.rb

@@ -2,7 +2,6 @@ require 'chef/provider/lwrp_base'
 require 'chef/provider/chef_node'
 require 'openssl'
 require 'chef/provisioning/chef_provider_action_handler'
-require 'chef/provisioning/chef_image_spec'
 
 class Chef
 class Provider
@@ -20,49 +19,82 @@ class MachineImage < Chef::Provider::LWRPBase
     @new_driver ||= run_context.chef_provisioning.driver_for(new_resource.driver)
   end
 
+  def chef_managed_entry_store
+    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+  end
+
   action :create do
     # Get the image mapping on the server (from name to image-id)
-    image_spec = Chef::Provisioning::ChefImageSpec.get(new_resource.name, new_resource.chef_server) ||
-                 Chef::Provisioning::ChefImageSpec.empty(new_resource.name, new_resource.chef_server)
-    if image_spec.location
+    image_spec = chef_managed_entry_store.get_or_new(:machine_image, new_resource.name)
+    if image_spec.reference
       # TODO check for real existence and maybe update
     else
       #
       # Create a new image
       #
-      image_spec.machine_options = new_resource.machine_options
-      create_image(image_spec)
+      create_image(image_spec, new_resource.machine_options || {})
     end
   end
 
   action :destroy do
+    # Destroy the exemplar machine if it exists
+    machine_provider = Chef::Provider::Machine.new(new_resource, run_context)
+    machine_provider.action_handler = action_handler
+    machine_provider.load_current_resource
+    machine_provider.action_destroy
+
     # Get the image mapping on the server (from name to image-id)
-    image_spec = Chef::Provisioning::ChefImageSpec.get(new_resource.name, new_resource.chef_server) ||
-        Chef::Provisioning::ChefImageSpec.empty(new_resource.name, new_resource.chef_server)
+    image_spec = chef_managed_entry_store.get(:machine_image, new_resource.name)
 
-    if image_spec.location
+    if image_spec && image_spec.reference
       new_driver.destroy_image(action_handler, image_spec, new_resource.image_options)
       image_spec.delete(action_handler)
     end
   end
 
-  def create_image(image_spec)
+  def create_image(image_spec, machine_options)
     # 1. Create the exemplar machine
     machine_provider = Chef::Provider::Machine.new(new_resource, run_context)
+    machine_provider.action_handler = action_handler
     machine_provider.load_current_resource
     machine_provider.action_converge
 
     # 2. Create the image
-    new_driver.allocate_image(action_handler, image_spec, new_resource.image_options,
-                              machine_provider.machine_spec)
+    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
+    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']
 
     # 3. Save the linkage from name -> image id
     image_spec.save(action_handler)
 
     # 4. Wait for image to be ready
-    new_driver.ready_image(action_handler, image_spec, new_resource.image_options)
+    new_driver.ready_image(action_handler, image_spec, new_image_options)
+
+    machine_provider.action_destroy
   end
 
+  def new_image_options
+    @new_image_options ||= (new_resource.image_options || {}).to_hash.dup
+  end
+
+  def new_machine_options
+    @new_machine_options ||= (new_resource.machine_options || {}).to_hash.dup
+  end
+
+end
 end
 end
-end
+
+require 'chef/provisioning/chef_managed_entry_store'
+Chef::Provisioning::ChefManagedEntryStore.type_names_for_backcompat[:machine_image] = "images"