chef-provisioning 1.7.0 → 1.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e7fd5bcf32d76ca54ace79c1e28d0e1c539c9dc2
4
- data.tar.gz: 02a60344f09ab222430db4d077597ca23738a161
3
+ metadata.gz: 6ee96fbea51a512c81d87f6ddbff79b79cca29da
4
+ data.tar.gz: 882cace973c1a92e57939422b37176fd35bcaffa
5
5
  SHA512:
6
- metadata.gz: 2768564afefbe6075d8603e813619aea1c55e8cf4bd916679406fdca52d90176ce721a150a550bc5605e450190414378d19157a7037259ddd3e939e7b721f714
7
- data.tar.gz: cd1ec5fcbf6f2bea383973ad71f85c91d93f3b41a4f6c422d8e4bebc1c899d1c1b7aa9d304cab26f435825a00e7e39779ebd489e48d9020301f16d4522a1f675
6
+ metadata.gz: d8eb175fd67272018a88ae1acb40bfed03f84d2c5271ed93c8bea121784d32ff6d85f94cd03cf9fd8bb96e17603841fcabe9570c7b16580f33ede90ffc0213da
7
+ data.tar.gz: 9253ea514642ff355cfc16458b2f2e2ce362000814a49cb402391fb4ac6d6947f549ac5da81672188538182d3a97a1bd0eadea92f543ac3ffd74c102f73ae79e
data/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Change Log
2
2
 
3
+ ## [1.7.1](https://github.com/chef/chef-provisioning/tree/1.7.1) (2016-05-17)
4
+ [Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.7.0...1.7.1)
5
+
6
+ **Merged pull requests:**
7
+
8
+ - 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))
9
+
3
10
  ## [1.7.0](https://github.com/chef/chef-provisioning/tree/1.7.0) (2016-04-06)
4
11
  [Full Changelog](https://github.com/chef/chef-provisioning/compare/v1.6.0...1.7.0)
5
12
 
@@ -27,6 +27,7 @@ module Provisioning
27
27
  :client_pem_path => '/etc/chef/client.pem'
28
28
  })
29
29
  super(convergence_options, config)
30
+ @client_rb_path ||= convergence_options[:client_rb_path]
30
31
  @chef_version ||= convergence_options[:chef_version]
31
32
  @prerelease ||= convergence_options[:prerelease]
32
33
  @package_cache_path ||= convergence_options[:package_cache_path] || "#{ENV['HOME']}/.chef/package_cache"
@@ -80,7 +81,7 @@ module Provisioning
80
81
  action_handler.open_stream(machine.node['name']) do |stdout|
81
82
  action_handler.open_stream(machine.node['name']) do |stderr|
82
83
  command_line = "chef-client"
83
- command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
84
+ command_line << " -c #{@client_rb_path} -l #{config[:log_level].to_s}" if config[:log_level]
84
85
  machine.execute(action_handler, command_line,
85
86
  :stream_stdout => stdout,
86
87
  :stream_stderr => stderr,
@@ -14,6 +14,7 @@ module Provisioning
14
14
  :client_pem_path => '/etc/chef/client.pem'
15
15
  })
16
16
  super(convergence_options, config)
17
+ @client_rb_path ||= convergence_options[:client_rb_path]
17
18
  @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
18
19
  @chef_version = convergence_options[:chef_version]
19
20
  @prerelease = convergence_options[:prerelease]
@@ -22,6 +23,7 @@ module Provisioning
22
23
  @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
23
24
  end
24
25
 
26
+ attr_reader :client_rb_path
25
27
  attr_reader :chef_version
26
28
  attr_reader :prerelease
27
29
  attr_reader :install_sh_path
@@ -53,7 +55,7 @@ module Provisioning
53
55
  action_handler.open_stream(machine.node['name']) do |stdout|
54
56
  action_handler.open_stream(machine.node['name']) do |stderr|
55
57
  command_line = "chef-client"
56
- command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
58
+ command_line << " -c #{@client_rb_path} -l #{config[:log_level].to_s}" if config[:log_level]
57
59
  machine.execute(action_handler, command_line,
58
60
  :stream_stdout => stdout,
59
61
  :stream_stderr => stderr,
@@ -1,5 +1,5 @@
1
1
  class Chef
2
2
  module Provisioning
3
- VERSION = '1.7.0'
3
+ VERSION = '1.7.1'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-provisioning
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0
4
+ version: 1.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Keiser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-06 00:00:00.000000000 Z
11
+ date: 2016-05-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ssh
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
289
289
  version: '0'
290
290
  requirements: []
291
291
  rubyforge_project:
292
- rubygems_version: 2.4.7
292
+ rubygems_version: 2.6.3
293
293
  signing_key:
294
294
  specification_version: 4
295
295
  summary: A library for creating machines and infrastructures idempotently in Chef.