chef-provisioning 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4af26c18a0d3c96d499c8d7b1267264d15244cfe
-  data.tar.gz: bcb53c4299f239845c449366f3ae39397143b90e
+  metadata.gz: c9af2567c4ea25e723b6ba5f11a10fb37aadc6d9
+  data.tar.gz: 171c144d04965d8bbadd1e8bdfb0740d56b987f5
 SHA512:
-  metadata.gz: 347c6a36818a4f6529b4bd1798fa3c22707efc5a36114fc7ebd520cad735cdabd1fd359c65231c93f5a35d69fc849a076a5e7cf4773c6de74b117af6e3aa795f
-  data.tar.gz: d872f47eb7ced3c6a3132eb4f8346cf0b6c2fd9c72c54be41e4ee46dc3465a749b8d83b5c7247b412d4117e26894c69d5385500d9a146271731b3d18443d5162
+  metadata.gz: 19cd99cd3d7be8c998b42c62edb70c7124830bd608193fec6dcb5695e15e2ccfa5dfd2bc3125c4f683eb3c6ce6a273b4ad8661f384a683f4a3ad2395310742af
+  data.tar.gz: a9ffd30e83bd04d7c78b6b17ae0b6ec47b819dd685647ebc242b0e9507e7649d68b3df5b19a7f25287afc0105f9df6d61cd3cccf8e09ae66fe64caf059ef76be

data/CHANGELOG.md

@@ -1,7 +1,28 @@
 # Change Log
 
-## [1.4.1](https://github.com/chef/chef-provisioning/tree/1.4.1) (2015-09-30)
-[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.4.0...1.4.1)
+## [1.5.0](https://github.com/chef/chef-provisioning/tree/1.5.0) (2015-10-23)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.4.1...1.5.0)
+
+**Fixed bugs:**
+
+- :converge action should not re-install chef-client if the desired version is already installed [\#428](https://github.com/chef/chef-provisioning/issues/428)
+- SSH available timeout needs to be configurable [\#362](https://github.com/chef/chef-provisioning/issues/362)
+- Making available? timeout use provided ssh\_options, fixes \#362 [\#466](https://github.com/chef/chef-provisioning/pull/466) ([tyler-ball](https://github.com/tyler-ball))
+- Pinning to mixlib-install 0.7.0 until 1.0 is out [\#464](https://github.com/chef/chef-provisioning/pull/464) ([tyler-ball](https://github.com/tyler-ball))
+- Added bootstrap\_no\_proxy support [\#458](https://github.com/chef/chef-provisioning/pull/458) ([jsmartt](https://github.com/jsmartt))
+
+**Closed issues:**
+
+- The action "stop" on a Machine resource does not appear to work [\#463](https://github.com/chef/chef-provisioning/issues/463)
+- machine chef-client run output not logging to provisioner chef-client output [\#274](https://github.com/chef/chef-provisioning/issues/274)
+
+**Merged pull requests:**
+
+- Add gemspec files to allow bundler to run from the gem [\#461](https://github.com/chef/chef-provisioning/pull/461) ([ksubrama](https://github.com/ksubrama))
+- Pin mixlib-install more strictly. [\#459](https://github.com/chef/chef-provisioning/pull/459) ([sersut](https://github.com/sersut))
+
+## [v1.4.1](https://github.com/chef/chef-provisioning/tree/v1.4.1) (2015-09-30)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.4.0...v1.4.1)
 
 **Fixed bugs:**
 

data/Gemfile

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+gemspec
+
+#gem 'mixlib-install', path: '../mixlib-install'
+#gem 'net-ssh', :path => '../net-ssh'
+#gem 'chef', :path => '../chef'
+#gem 'ohai', :path => '../ohai'
+#gem 'cheffish', :path => '../cheffish' # :git => 'https://github.com/jkeiser/cheffish.git'
+#gem 'chef-provisioning-vagrant', :path => '../chef-provisioning-vagrant'
+#gem 'chef-provisioning-fog', :path => '../chef-provisioning-fog'
+#gem 'chef-provisioning-aws', :path => '../chef-provisioning-aws'
+#gem 'chef-zero', :path => '../chef-zero'
+group :development do
+#  gem "berkshelf", github: "berkshelf/berkshelf"
+end

data/README.md

@@ -172,6 +172,7 @@ with_machine_options({
     chef_config: "log_level :debug\\n", # String containing additional text to inject into client.rb
     chef_server: "http://my.chef.server/", # TODO could conflict with https://github.com/chef/chef-provisioning#pointing-boxes-at-chef-servers
     bootstrap_proxy: "http://localhost:1234",
+    bootstrap_no_proxy: "localhost, *.example.com, my.chef.server",
     ssl_verify_mode: :verify_peer,
     client_rb_path: "/etc/chef/client.rb", # <- DEFAULT, overwrite if necessary
     client_pem_path: "/etc/chef/client.pem", # <- DEFAULT, overwrite if necessary

data/chef-provisioning.gemspec

@@ -0,0 +1,35 @@
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'chef/provisioning/version'
+
+Gem::Specification.new do |s|
+  s.name = 'chef-provisioning'
+  s.version = Chef::Provisioning::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'LICENSE' ]
+  s.summary = 'A library for creating machines and infrastructures idempotently in Chef.'
+  s.description = s.summary
+  s.author = 'John Keiser'
+  s.email = 'jkeiser@chef.io'
+  s.homepage = 'http://github.com/chef/chef-provisioning/README.md'
+
+  s.add_dependency 'net-ssh', '~> 2.0'
+  s.add_dependency 'net-scp', '~> 1.0'
+  s.add_dependency 'net-ssh-gateway', '~> 1.2.0'
+  s.add_dependency 'inifile', '~> 2.0'
+  s.add_dependency 'cheffish', '~> 1.3', '>= 1.3.1'  # 1.3.1 allows 'let' vars in unquoted recipes.
+  s.add_dependency 'winrm', '~> 1.3'
+  s.add_dependency "mixlib-install",  "~> 0.7.0"
+
+  s.add_development_dependency 'chef', '~> 12.1', "!= 12.4.0"  # 12.4.0 is incompatible.
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'simplecov'
+
+  s.bindir       = "bin"
+  s.executables  = %w( )
+
+  s.require_path = 'lib'
+  s.files = %w(Gemfile Rakefile LICENSE README.md CHANGELOG.md) + Dir.glob("*.gemspec") +
+      Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+end

data/lib/chef/provider/machine.rb

@@ -77,11 +77,15 @@ class Machine < Chef::Provider::LWRPBase
   end
 
   action :converge_only do
-    machine = run_context.chef_provisioning.connect_to_machine(machine_spec, current_machine_options)
-    begin
-      machine.converge(action_handler)
-    ensure
-      machine.disconnect
+    if new_resource.converge == false
+      Chef::Log.debug("Not converging #{machine_spec.name} because 'converge false' is set.")
+    else
+      machine = run_context.chef_provisioning.connect_to_machine(machine_spec, current_machine_options)
+      begin
+        machine.converge(action_handler)
+      ensure
+        machine.disconnect
+      end
     end
   end
 

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

@@ -14,7 +14,6 @@ module Provisioning
           :client_pem_path => '/etc/chef/client.pem'
         })
         super(convergence_options, config)
-        @install_sh_url = convergence_options[:install_sh_url] || 'https://www.chef.io/chef/install.sh'
         @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
         @chef_version = convergence_options[:chef_version]
         @prerelease = convergence_options[:prerelease]
@@ -25,7 +24,6 @@ module Provisioning
 
       attr_reader :chef_version
       attr_reader :prerelease
-      attr_reader :install_sh_url
       attr_reader :install_sh_path
       attr_reader :install_sh_arguments
       attr_reader :bootstrap_env

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

@@ -239,6 +239,11 @@ module Provisioning
             https_proxy #{convergence_options[:bootstrap_proxy].inspect}
           EOM
         end
+        if convergence_options[:bootstrap_no_proxy]
+          content << <<-EOM
+            no_proxy #{convergence_options[:bootstrap_no_proxy].inspect}
+          EOM
+        end
         content.gsub!(/^\s+/, "")
         content << convergence_options[:chef_config] if convergence_options[:chef_config]
         content

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

@@ -174,8 +174,8 @@ module Provisioning
       end
 
       def available?
-        # If you can't pwd within 10 seconds, you can't pwd
-        execute('pwd', :timeout => 10)
+        timeout = ssh_options[:timeout] || 10
+        execute('pwd', :timeout => timeout)
         true
       rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::EHOSTDOWN, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect
         Chef::Log.debug("#{username}@#{host} unavailable: network connection failed or broke: #{$!.inspect}")
@@ -191,10 +191,10 @@ module Provisioning
 
       def session
         @session ||= begin
+          # Small initial connection timeout (10s) to help us fail faster when server is just dead
           ssh_start_opts = { timeout:10 }.merge(ssh_options)
           Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_start_opts.dup.tap {
                               |ssh| ssh.delete(:key_data) }.inspect}")
-          # Small initial connection timeout (10s) to help us fail faster when server is just dead
           begin
             if gateway? then gateway.ssh(host, username, ssh_start_opts)
             else Net::SSH.start(host, username, ssh_start_opts)

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -200,9 +200,11 @@ extra_rdoc_files:
 - LICENSE
 files:
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- chef-provisioning.gemspec
 - lib/chef/provider/load_balancer.rb
 - lib/chef/provider/machine.rb
 - lib/chef/provider/machine_batch.rb