chef-provisioning 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf81e38047405e6ffb044e3112628cd6cce7732
-  data.tar.gz: 18351e619438b43f8e2ef7f6622de7a416a4ba84
+  metadata.gz: d1d0e8bd93eb76771d1303941bb28915e896fcc0
+  data.tar.gz: 51efa93be19879302fb8667c019083c0e361ab6c
 SHA512:
-  metadata.gz: 846ed8458a5d37d3befd1cc983b81ec7efd26a7d4b5ad10bd43f0485b7c78d8f499ea7f89bea6964bee7735e97b41640dcde5312834d6b59a47013efdeecf014
-  data.tar.gz: 800540b188262a24c73cce456a5116aed4d707863025cba6dfbdc9c00af9b6c2bb33cee04f2e3a8bd3d2da5be4b3b2d36847c28a670ad45dfa30a384d0eb8653
+  metadata.gz: ab0789c2693c7ec113fdf2382359a802f3d47d9fc4b17b2baf366d4baffca4eada93bae2a4269b80db08e01e7c55ff2e482f61066a53e53ba16272355e5bbbd2
+  data.tar.gz: 36288cf508696c26b97962be8d548780ec0575705c5e0b5b9bac5e55fdb679c7fb9ca9cd81234f9c70fe4a1981b4d604db8d51647aaa4e21e3d4690b0373f9f6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Chef Provisioning Changelog
 
+## 1.3.0 (8/5/2015)
+
+- Expose machine_spec.from_image to allocate_machine ([#366][], [@mwrock][])
+- Use mixlib-install to install from omnitruck ([#389][], [@thommay][])
+
 ## 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][])
@@ -314,7 +319,9 @@
 [#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
+[#366]: https://github.com/chef/chef-provisioning/issues/366
 [#369]: https://github.com/chef/chef-provisioning/issues/369
+[#389]: https://github.com/chef/chef-provisioning/issues/389
 [@MrMMorris]: https://github.com/MrMMorris
 [@causton1]: https://github.com/causton1
 [@chef]: https://github.com/chef
@@ -330,6 +337,7 @@
 [@mivok]: https://github.com/mivok
 [@mwrock]: https://github.com/mwrock
 [@segv]: https://github.com/segv
+[@thommay]: https://github.com/thommay
 [@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

@@ -1,10 +1,31 @@
-[![Stories in Ready](https://badge.waffle.io/chef/chef-provisioning.png?label=ready&title=Ready)](https://waffle.io/chef/chef-provisioning)
 Chef Provisioning
 ==========
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/chef/chef-provisioning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Stories in Ready](https://badge.waffle.io/chef/chef-provisioning.png?label=ready&title=Ready)](https://waffle.io/chef/chef-provisioning)
+[![Status](https://travis-ci.org/chef/chef-provisioning.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning)
+
+Driver build status:
+
+AWS | Azure | Docker | Fog | Hanlon | LXC | ssh | Vagrant
+---- | ---- | ---- | ---- | ---- | ---- | ---- | ----
+[![Status](https://travis-ci.org/chef/chef-provisioning-aws.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-aws)| [![Status](https://travis-ci.org/chef/chef-provisioning-azure.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-azure) | [![Status](https://travis-ci.org/chef/chef-provisioning-docker.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-docker) | [![Status](https://travis-ci.org/chef/chef-provisioning-fog.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-fog) | [![Status](https://travis-ci.org/chef/chef-provisioning-hanlon.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-hanlon) | [![Status](https://travis-ci.org/chef/chef-provisioning-lxc.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-lxc) | [![Status](https://travis-ci.org/chef/chef-provisioning-ssh.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-ssh) | [![Status](https://travis-ci.org/chef/chef-provisioning-vagrant.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-vagrant)
 
 This library solves the problem of repeatably creating machines and infrastructures in Chef.  It has a plugin model that lets you write bootstrappers for your favorite infrastructures, including VirtualBox, EC2, LXC, bare metal, and many more!
 
+Documentation
+-------------
+
+These are the primary documents to help learn about using Provisioning and creating Provisioning drivers:
+
+* [Chef Docs](https://docs.chef.io/provisioning.html)
+* [Frequently Asked Questions](https://github.com/chef/chef-provisioning/blob/master/docs/faq.md)
+* [Configuration](https://github.com/chef/chef-provisioning/blob/master/docs/configuration.md#configuring-and-using-provisioning-drivers)
+* [Writing Drivers](https://github.com/chef/chef-provisioning/blob/master/docs/building_drivers.md#writing-drivers)
+* [Embedding](https://github.com/chef/chef-provisioning/blob/master/docs/embedding.md)
+* [Providers](https://github.com/chef/chef-provisioning/blob/master/docs/providers)
+
+Media
+-----
 [This video](https://www.youtube.com/watch?v=Yb8QdL30WgM) explains the basics of chef-provisioning (though provisioners are now called drivers).  Slides (more up to date) are [here](http://slides.com/jkeiser/chef-metal).
 
 Date       | Blog
@@ -17,15 +38,6 @@ Date       | Blog
 2014-03-04 | [Chef Metal 0.2: Overview](http://www.chef.io/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
 2013-12-20 | [Chef Metal Alpha](http://www.chef.io/blog/2013/12/20/chef-metal-alpha/)
 
-Documentation
--------------
-* [Chef Docs](https://docs.chef.io/provisioning.html)
-* [Frequently Asked Questions](https://github.com/chef/chef-provisioning/blob/master/docs/faq.md)
-* [Configuration](https://github.com/chef/chef-provisioning/blob/master/docs/configuration.md#configuring-and-using-provisioning-drivers)
-* [Writing Drivers](https://github.com/chef/chef-provisioning/blob/master/docs/building_drivers.md#writing-drivers)
-* [Embedding](https://github.com/chef/chef-provisioning/blob/master/docs/embedding.md)
-* [Providers](https://github.com/chef/chef-provisioning/blob/master/docs/providers)
-
 Try It Out
 ----------
 
@@ -239,28 +251,14 @@ with_chef_server "https://chef-server.example.org",
   :signing_key_filename => Chef::Config[:client_key]
 ```
 
-**Note for Hosted/Enterprise Chef Servers**
+Finally, you can specify a Chef Server for an individual machine by using the `chef_server` attribute.  This attribute takes the same additional options (`:client_name`, `:signing_key_filename`) that `with_chef_server` does.
 
-Currently, you will need to add the 'clients' group to the 'admin' group in order for machine provisioning to work:
-
-```
-knife edit /groups/admin.json -e <editor>
-```
-Then add:
-```
-{
-  "users": [
-    "pivotal" # This is an internal superuser for Hosted/Enterprise Chef
-  ],
-  "groups": [
-    "clients" # This is what you need to add
-  ]
-}
+```ruby
+machine 'mario' do
+  chef_server :chef_server_url => "https://chef-server.example.org"
+end
 ```
 
-This can also be done through the Chef Server web UI (Administration tab > Groups > select admins Group > Add 'clients'
-
-
 Kitchen
 -------
 

data/lib/chef/provider/machine.rb

@@ -146,6 +146,7 @@ class Machine < Chef::Provider::LWRPBase
         end
     }
 
+    configs << { from_image: new_resource.from_image } if new_resource.from_image
     configs << new_resource.machine_options if new_resource.machine_options
     configs << driver.config[:machine_options] if driver.config[:machine_options]
     Cheffish::MergedConfig.new(*configs)

data/lib/chef/provisioning.rb

@@ -50,6 +50,9 @@ module Provisioning
       begin
         require "chef_metal/driver_init/#{scheme}"
       rescue LoadError
+        # try the doomed require again so the stack trace shows the first LoadError and not the second (which
+        # would throw a confusing "chef_metal" into the error output of what is now chef-provisioning). one
+        # could also experiment with saving the first LoadError and re-raising it.
         require "chef/provisioning/driver_init/#{scheme}"
       end
     end

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

@@ -1,4 +1,5 @@
 require 'chef/provisioning/convergence_strategy/precreate_chef_objects'
+require 'mixlib/install'
 require 'pathname'
 
 class Chef
@@ -9,8 +10,6 @@ module Provisioning
         super
         @chef_version ||= convergence_options[:chef_version]
         @prerelease ||= convergence_options[:prerelease]
-        @install_msi_url = convergence_options[:install_msi_url] || 'https://www.chef.io/chef/install.msi'
-        @install_msi_path = convergence_options[:install_msi_path] || "$env:TEMP\\#{File.basename(@install_msi_url)}"
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 
@@ -28,35 +27,16 @@ module Provisioning
           })
         end
 
-        super
-
-        # Check for existing chef client.
-        version = machine.execute_always('chef-client -v')
-
-        # Don't do install/upgrade if a chef client exists and
-        # no chef version is defined by user configs or
-        # the chef client's version already matches user config
-        if version.exitstatus == 0
-          version = version.stdout.strip
-          if !chef_version
-            return
-          elsif version =~ /Chef: #{chef_version}$/
-            Chef::Log.debug "Already installed chef version #{version}"
-            return
-          elsif version.include?(chef_version)
-            Chef::Log.warn "Installed chef version #{version} contains desired version #{chef_version}.  " +
-              "If you see this message on consecutive chef runs tighten your desired version constraint to prevent " +
-              "multiple convergence."
-          end
+        opts = {"prerelease" => prerelease}
+        if convergence_options[:bootstrap_proxy]
+          opts["http_proxy"] = convergence_options[:bootstrap_proxy]
+          opts["https_proxy"] = convergence_options[:bootstrap_proxy]
         end
+        opts["install_msi_url"] = convergence_options[:install_msi_url] if convergence_options[:install_msi_url]
+        super
 
-        # Install chef client
-        # TODO ssh verification of install.msi before running arbtrary code would be nice?
-        # TODO find a way to cache this on the host like with the Unix stuff.
-        # Limiter is we don't know how to efficiently upload large files to
-        # the remote machine with WMI.
-        machine.execute(action_handler, "(New-Object System.Net.WebClient).DownloadFile(#{machine.escape(install_msi_url)}, #{machine.escape(install_msi_path)})")
-        machine.execute(action_handler, "msiexec /qn /i #{machine.escape(install_msi_path)}")
+        install_command = Mixlib::Install.new(chef_version, true, opts).install_command
+        machine.execute(action_handler, install_command)
       end
 
       def converge(action_handler, machine)
@@ -73,6 +53,7 @@ module Provisioning
           end
         end
       end
+
     end
   end
 end

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

@@ -1,5 +1,6 @@
 require 'chef/provisioning/convergence_strategy/precreate_chef_objects'
 require 'pathname'
+require 'mixlib/install'
 
 class Chef
 module Provisioning
@@ -29,58 +30,19 @@ module Provisioning
       attr_reader :install_sh_arguments
       attr_reader :bootstrap_env
 
-      def install_sh_command_line
-        arguments = install_sh_arguments ? " #{install_sh_arguments}" : ""
-        arguments << " -v #{chef_version}" if chef_version
-        arguments << " -p" if prerelease
-        "bash -c '#{bootstrap_env} bash #{install_sh_path}#{arguments}'"
-      end
-
       def setup_convergence(action_handler, machine)
         super
 
-        # Check for existing chef client.
-        version = machine.execute_always('chef-client -v')
-
-        # Don't do install/upgrade if a chef client exists and
-        # no chef version is defined by user configs or
-        # the chef client's version already matches user config
-        if version.exitstatus == 0
-          version = version.stdout.strip
-          if !chef_version
-            return
-          # This logic doesn't cover the case for a client with 12.0.1.dev.0 => 12.0.1
-          # so we decided to just use exact version for the time being (see comments in PR 303)
-          #elsif version.stdout.strip =~ /Chef: #{chef_version}([^0-9]|$)/
-          elsif version =~ /Chef: #{chef_version}$/
-            Chef::Log.debug "Already installed chef version #{version}"
-            return
-          elsif version.include?(chef_version)
-            Chef::Log.warn "Installed chef version #{version} contains desired version #{chef_version}.  " +
-              "If you see this message on consecutive chef runs tighten your desired version constraint to prevent " +
-              "multiple convergence."
-          end
+        opts = {"prerelease" => prerelease}
+        if convergence_options[:bootstrap_proxy]
+          opts["http_proxy"] = convergence_options[:bootstrap_proxy]
+          opts["https_proxy"] = convergence_options[:bootstrap_proxy]
         end
 
-        # Install chef client
-        # TODO ssh verification of install.sh before running arbtrary code would be nice?
-        if !convergence_options[:bootstrap_proxy] || convergence_options[:bootstrap_proxy].empty?
-          @@install_sh_cache[install_sh_url] ||= Net::HTTP.get(URI(install_sh_url))
-        else
-          @@install_sh_cache[install_sh_url] ||= begin
-            proxy_uri = URI.parse(convergence_options[:bootstrap_proxy])
-            chef_uri  = URI.parse(@install_sh_url)
-            proxy     = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
-            req       = Net::HTTP::Get.new(chef_uri.path)
-            script    = proxy.start(chef_uri.host, :use_ssl => proxy_uri.scheme == 'https') do |http|
-              http.request(req)
-            end
-            script.body
-          end
-        end
-        machine.write_file(action_handler, install_sh_path, @@install_sh_cache[install_sh_url], :ensure_dir => true)
-        # TODO handle bad version case better
-        machine.execute(action_handler, install_sh_command_line)
+        install_command = Mixlib::Install.new(chef_version, false, opts).install_command
+        machine.write_file(action_handler, install_sh_path, install_command, :ensure_dir => true)
+        machine.set_attributes(action_handler, install_sh_path, :mode => '0755')
+        machine.execute(action_handler, "sh -c #{install_sh_path}")
       end
 
       def converge(action_handler, machine)

data/lib/chef/provisioning/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mixlib-install
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement