chef-provisioning 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7fd5bcf32d76ca54ace79c1e28d0e1c539c9dc2
-  data.tar.gz: 02a60344f09ab222430db4d077597ca23738a161
+  metadata.gz: 6ee96fbea51a512c81d87f6ddbff79b79cca29da
+  data.tar.gz: 882cace973c1a92e57939422b37176fd35bcaffa
 SHA512:
-  metadata.gz: 2768564afefbe6075d8603e813619aea1c55e8cf4bd916679406fdca52d90176ce721a150a550bc5605e450190414378d19157a7037259ddd3e939e7b721f714
-  data.tar.gz: cd1ec5fcbf6f2bea383973ad71f85c91d93f3b41a4f6c422d8e4bebc1c899d1c1b7aa9d304cab26f435825a00e7e39779ebd489e48d9020301f16d4522a1f675
+  metadata.gz: d8eb175fd67272018a88ae1acb40bfed03f84d2c5271ed93c8bea121784d32ff6d85f94cd03cf9fd8bb96e17603841fcabe9570c7b16580f33ede90ffc0213da
+  data.tar.gz: 9253ea514642ff355cfc16458b2f2e2ce362000814a49cb402391fb4ac6d6947f549ac5da81672188538182d3a97a1bd0eadea92f543ac3ffd74c102f73ae79e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.7.1](https://github.com/chef/chef-provisioning/tree/1.7.1) (2016-05-17)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.7.0...1.7.1)
+
+**Merged pull requests:**
+
+- install_sh and install_cached convergence strategies trigger chef-client with -c flag [\#518](https://github.com/chef/chef-provisioning/pull/518) ([poliva83](https://github.com/poliva83))
+
 ## [1.7.0](https://github.com/chef/chef-provisioning/tree/1.7.0) (2016-04-06)
 [Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.6.0...1.7.0)
 

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

@@ -27,6 +27,7 @@ module Provisioning
           :client_pem_path => '/etc/chef/client.pem'
         })
         super(convergence_options, config)
+        @client_rb_path ||= convergence_options[:client_rb_path]
         @chef_version ||= convergence_options[:chef_version]
         @prerelease ||= convergence_options[:prerelease]
         @package_cache_path ||= convergence_options[:package_cache_path] || "#{ENV['HOME']}/.chef/package_cache"
@@ -80,7 +81,7 @@ module Provisioning
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
             command_line = "chef-client"
-            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
+            command_line << " -c #{@client_rb_path} -l #{config[:log_level].to_s}" if config[:log_level]
             machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,

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

@@ -14,6 +14,7 @@ module Provisioning
           :client_pem_path => '/etc/chef/client.pem'
         })
         super(convergence_options, config)
+        @client_rb_path ||= convergence_options[:client_rb_path]
         @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
         @chef_version = convergence_options[:chef_version]
         @prerelease = convergence_options[:prerelease]
@@ -22,6 +23,7 @@ module Provisioning
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 
+      attr_reader :client_rb_path
       attr_reader :chef_version
       attr_reader :prerelease
       attr_reader :install_sh_path
@@ -53,7 +55,7 @@ module Provisioning
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
             command_line = "chef-client"
-            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
+            command_line << " -c #{@client_rb_path} -l #{config[:log_level].to_s}" if config[:log_level]
             machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.