chef-provisioning 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8779389e38c408619ab78eefda047f78e5c1826a
-  data.tar.gz: 61a5f41ab6289315509f7151b9d8e52369a23b8c
+  metadata.gz: bdf81e38047405e6ffb044e3112628cd6cce7732
+  data.tar.gz: 18351e619438b43f8e2ef7f6622de7a416a4ba84
 SHA512:
-  metadata.gz: 5ae3ba3ae5ec38f25ee0aa596d886c42be3a9c47c0c09e9790f03156bccf08989132ff91dfac06f75787ee7b655a804701fb79a66d9c709212977c481e8aeb2a
-  data.tar.gz: 7ba2b3c08365bccce537dc692913e0e753d096b09293b9fd024b6b31fb58bcea891076b819b483ee5d6fd9ad89f547f7d6584eeb5311ae8d79134a42ccf332c2
+  metadata.gz: 846ed8458a5d37d3befd1cc983b81ec7efd26a7d4b5ad10bd43f0485b7c78d8f499ea7f89bea6964bee7735e97b41640dcde5312834d6b59a47013efdeecf014
+  data.tar.gz: 800540b188262a24c73cce456a5116aed4d707863025cba6dfbdc9c00af9b6c2bb33cee04f2e3a8bd3d2da5be4b3b2d36847c28a670ad45dfa30a384d0eb8653

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Chef Provisioning Changelog
 
+## 1.2.1 (7/17/2015)
+
+- Added support for `options[:scp_temp_dir]` to permit specifying a directory other than `/tmp` to copy files to via SCP. ([#339][])
+- Removing acceptance tests because they are super stale. ([#363][])
+- Fix arrity mismatch on `Driver#destroy_image` method. ([#364][])
+- Doc updates ([#344][], [#346][], [#352][], [#369][])
+
 ## 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][])
@@ -301,6 +308,13 @@
 [#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
+[#339]: https://github.com/chef/chef-provisioning/issues/339
+[#344]: https://github.com/chef/chef-provisioning/issues/344
+[#346]: https://github.com/chef/chef-provisioning/issues/346
+[#352]: https://github.com/chef/chef-provisioning/issues/352
+[#363]: https://github.com/chef/chef-provisioning/issues/363
+[#364]: https://github.com/chef/chef-provisioning/issues/364
+[#369]: https://github.com/chef/chef-provisioning/issues/369
 [@MrMMorris]: https://github.com/MrMMorris
 [@causton1]: https://github.com/causton1
 [@chef]: https://github.com/chef
@@ -318,4 +332,4 @@
 [@segv]: https://github.com/segv
 [@tyler-ball]: https://github.com/tyler-ball
 [@xeon22]: https://github.com/xeon22
-[@xorl]: https://github.com/xorl
+[@xorl]: https://github.com/xorl

data/README.md

@@ -38,6 +38,7 @@ To give it a spin, install Vagrant and VirtualBox and try this from the `chef-pr
 ```
 gem install chef-provisioning chef-provisioning-vagrant
 export CHEF_DRIVER=vagrant
+export VAGRANT_DEFAULT_PROVIDER=virtualbox
 chef-client -z vagrant_linux.rb simple.rb
 ```
 
@@ -48,7 +49,7 @@ This will create two vagrant precise64 linux boxes, "mario" and "luigi1", in `~/
 If you have an AWS account, you can spin up a machine there like this:
 
 ```
-gem install chef-provisioning chef-provisioning-fog
+gem install chef-provisioning chef-provisioning-aws
 export CHEF_DRIVER=aws
 chef-client -z simple.rb
 ```
@@ -130,7 +131,7 @@ Drivers each have their own repository.  Current drivers:
 
 **Virtualization:**
 - [Vagrant: VirtualBox, VMWare Fusion, etc.](https://github.com/chef/chef-provisioning-vagrant)
-- [VSphere](https://github.com/RallySoftware-cookbooks/chef-metal-vsphere) (not yet up to date with 0.11)
+- [VSphere](https://github.com/CenturyLinkCloud/chef-provisioning-vsphere)
 
 **Containers:**
 - [Docker](https://github.com/chef/chef-provisioning-docker)
@@ -147,9 +148,12 @@ chef-zero comes with a provisioner for Vagrant, an abstraction that covers Virtu
 
 ```ruby
 export CHEF_DRIVER=vagrant
+export VAGRANT_DEFAULT_PROVIDER=virtualbox
 chef-client -z vagrant_linux.rb simple.rb
 ```
 
+To use with VMWare, simply update the prior example to read ```export VAGRANT_DEFAULT_PROVIDER=vmware_fusion```
+
 This is a chef-client run, which runs multiple **recipes.** Chef Provisioning is nothing but resources you put in recipes.
 
 The driver is specified on the command line.  Drivers are URLs.  You could use `vagrant:~/vms` or `fog:AWS:default:us-east-1' as driver URLs.  More information [here.](https://github.com/chef/chef-provisioning/blob/master/docs/configuration.md#setting-the-driver-with-a-driver-url)
@@ -263,10 +267,10 @@ 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 
+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 
+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/provisioning/driver.rb

@@ -189,7 +189,7 @@ module Provisioning
     # @param [Chef::Provisioning::ManagedEntry] image_spec An image specification representing this image.
     # @param [Hash] image_options A set of options representing the desired state of the image
     # @param [Hash] machine_options A set of options representing the desired state of the machine used to create the image
-    def destroy_image(action_handler, image_spec, image_options, machine_options)
+    def destroy_image(action_handler, image_spec, image_options, machine_options={})
       raise "#{self.class} does not implement destroy_image"
     end
 

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

@@ -27,6 +27,9 @@ module Provisioning
       #     nil (the default) means no gateway. If the username is omitted,
       #     then the default username is used instead (i.e. the user running
       #     chef, or the username configured in .ssh/config).
+      #   - :scp_temp_dir: a directory to use as the temporary location for
+      #     files that are copied to the host via SCP.
+      #     Only used if :prefix is set. Default is '/tmp' if unspecified.
       # - global_config: an options hash that looks suspiciously similar to
       #   Chef::Config, containing at least the key :log_level.
       #
@@ -103,14 +106,18 @@ module Provisioning
         download(path, local_path)
       end
 
+      def remote_tempfile(path)
+        File.join(scp_temp_dir, "#{File.basename(path)}.#{Random.rand(2**32)}")
+      end
+
       def write_file(path, content)
         execute("mkdir -p #{File.dirname(path)}").error!
         if options[:prefix]
           # Make a tempfile on the other side, upload to that, and sudo mv / chown / etc.
-          remote_tempfile = "/tmp/#{File.basename(path)}.#{Random.rand(2**32)}"
-          Chef::Log.debug("Writing #{content.length} bytes to #{remote_tempfile} on #{username}@#{host}")
-          Net::SCP.new(session).upload!(StringIO.new(content), remote_tempfile)
-          execute("mv #{remote_tempfile} #{path}").error!
+          tempfile = remote_tempfile(path)
+          Chef::Log.debug("Writing #{content.length} bytes to #{tempfile} on #{username}@#{host}")
+          Net::SCP.new(session).upload!(StringIO.new(content), tempfile)
+          execute("mv #{tempfile} #{path}").error!
         else
           Chef::Log.debug("Writing #{content.length} bytes to #{path} on #{username}@#{host}")
           Net::SCP.new(session).upload!(StringIO.new(content), path)
@@ -121,14 +128,14 @@ module Provisioning
         execute("mkdir -p #{File.dirname(path)}").error!
         if options[:prefix]
           # Make a tempfile on the other side, upload to that, and sudo mv / chown / etc.
-          remote_tempfile = "/tmp/#{File.basename(path)}.#{Random.rand(2**32)}"
-          Chef::Log.debug("Uploading #{local_path} to #{remote_tempfile} on #{username}@#{host}")
-          Net::SCP.new(session).upload!(local_path, remote_tempfile)
+          tempfile = remote_tempfile(path)
+          Chef::Log.debug("Uploading #{local_path} to #{tempfile} on #{username}@#{host}")
+          Net::SCP.new(session).upload!(local_path, tempfile)
           begin
-            execute("mv #{remote_tempfile} #{path}").error!
+            execute("mv #{tempfile} #{path}").error!
           rescue
             # Clean up if we were unable to move
-            execute("rm #{remote_tempfile}").error!
+            execute("rm #{tempfile}").error!
           end
         else
           Chef::Log.debug("Uploading #{local_path} to #{path} on #{username}@#{host}")
@@ -202,21 +209,21 @@ module Provisioning
       def download(path, local_path)
         if options[:prefix]
           # Make a tempfile on the other side, upload to that, and sudo mv / chown / etc.
-          remote_tempfile = "/tmp/#{File.basename(path)}.#{Random.rand(2**32)}"
-          Chef::Log.debug("Downloading #{path} from #{remote_tempfile} to #{local_path} on #{username}@#{host}")
+          tempfile = remote_tempfile(path)
+          Chef::Log.debug("Downloading #{path} from #{tempfile} to #{local_path} on #{username}@#{host}")
           begin
-            execute("cp #{path} #{remote_tempfile}").error!
-            execute("chown #{username} #{remote_tempfile}").error!
-            do_download remote_tempfile, local_path
+            execute("cp #{path} #{tempfile}").error!
+            execute("chown #{username} #{tempfile}").error!
+            do_download tempfile, local_path
           rescue => e
-              Chef::Log.error "Unable to download #{path} to #{remote_tempfile} on #{username}@#{host} -- #{e}"
+              Chef::Log.error "Unable to download #{path} to #{tempfile} on #{username}@#{host} -- #{e}"
               nil
           ensure
             # Clean up afterwards
             begin
-              execute("rm #{remote_tempfile}").error!
+              execute("rm #{tempfile}").error!
             rescue => e
-              Chef::Log.warn "Unable to clean up #{remote_tempfile} on #{username}@#{host} -- #{e}"
+              Chef::Log.warn "Unable to clean up #{tempfile} on #{username}@#{host} -- #{e}"
             end
           end
         else
@@ -277,6 +284,10 @@ module Provisioning
 
       private
 
+      def scp_temp_dir
+        @scp_temp_dir ||= options.fetch(:scp_temp_dir, '/tmp')
+      end
+
       def gateway?
         options.key?(:ssh_gateway) and ! options[:ssh_gateway].nil?
       end

data/lib/chef/provisioning/version.rb

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

data/lib/chef/resource/machine.rb

@@ -26,7 +26,8 @@ class Machine < Chef::Resource::LWRPBase
   # Machine options
   attribute :machine_options
 
-  # Node attributes
+  # This includes attributes from the Cheffish::Node resources - allows us
+  # to specify things like `run_list`, `chef_server`, etc.
   Cheffish.node_attributes(self)
 
   # Client keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef