chef-provisioning 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917a608213be51a7acfc3f616d06ef93a079fe54
-  data.tar.gz: e608b5e1534f671f58b2df36acdae6457b1d784f
+  metadata.gz: 23cdbeec60b87a7414261d35d096ee08d4936b8a
+  data.tar.gz: 9a260eb4fd09736e6e4f188630557867d1bd2436
 SHA512:
-  metadata.gz: 921eebb41f34a581aca34816ba4d7e554a2b577f84943000d34fbd7e30f485bfd438a6b9f12f20a7833ee7b6b9875dc31a87b3326c0585d2b6b478dab7da22f2
-  data.tar.gz: 9b15f8bc9413697e0ea93874bb0c68eb540abaec7eee53d5f5e20ffef45de8598e2cdfa3f6fa28992075c878f47d002772b31a726f2bd3a242dab15db62e41ba
+  metadata.gz: f53271d1e990ca819d63e8546f5e27d6dadf02a029515671a8aa0010ce63f1cad7b79abcb5f563f01502a70a771ec8ce4f585b4f7e9078ab60c1c0f3d85e5d77
+  data.tar.gz: 121d57f2508b49a8407ed365279536f7f0ffa92972f69ec062b5b95c2d977c8e4d7dbe0e0d43a24eca786ab71a6c3cdd1a40ab4a355ed6f4af4c9b1cbfd1112b

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [2.5.0](https://github.com/chef/chef-provisioning/tree/2.5.0) (2017-07-24)
-[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.4.0...2.5.0)
+## [2.6.0](https://github.com/chef/chef-provisioning/tree/2.6.0) (2017-11-08)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.5.0...2.6.0)
+
+**Merged pull requests:**
+
+- Add an option to never use SSH port forwardin [\#596](https://github.com/chef/chef-provisioning/pull/596) ([jjlimepoint](https://github.com/jjlimepoint))
+- Typo + small wording fix [\#590](https://github.com/chef/chef-provisioning/pull/590) ([jblaine](https://github.com/jblaine))
+
+## [v2.5.0](https://github.com/chef/chef-provisioning/tree/v2.5.0) (2017-07-24)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.4.0...v2.5.0)
 
 **Merged pull requests:**
 
@@ -974,4 +982,4 @@
 ## [v0.1](https://github.com/chef/chef-provisioning/tree/v0.1) (2013-12-21)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -28,9 +28,9 @@ Maintained by Chef-Partners:
 * [vSphere](https://github.com/chef-partners/chef-provisioning-vsphere)
 * [vra](https://github.com/chef-partners/chef-provisioning-vra)
 
-One driver are not maintained by Chef:
+Maintained, not by Chef:
 
-* [AsureRM](https://github.com/pendrica/chef-provisioning-azurerm)
+* [AzureRM](https://github.com/pendrica/chef-provisioning-azurerm)
 
 Unmaintained Drivers are at risk of becoming stale. They are:
 
@@ -215,6 +215,7 @@ with_machine_options({
     :host_key_alias => "#{instance.id}.AWS", # DEFAULT
     :key_data => nil, # use key from ssh-agent instead of a local file; remember to ssh-add your keys!
     :forward_agent => true, # you may want your ssh-agent to be available on your provisioned machines
+    :never_forward_localhost => false, # This will, if set, disable SSH forwarding if it does not work/make sense in your envirnoment
     :remote_forwards => [
         # Give remote host access to squid proxy on provisioning node
         {:remote_port => 3128, :local_host => 'localhost', :local_port => 3128,},

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

@@ -43,6 +43,7 @@ module Provisioning
         @options = options
         @config = global_config
         @remote_forwards = ssh_options.delete(:remote_forwards) { Array.new }
+        @never_forward_localhost = ssh_options.delete(:never_forward_localhost)
       end
 
       attr_reader :host
@@ -173,7 +174,9 @@ module Provisioning
 
       def make_url_available_to_remote(local_url)
         uri = URI(local_url)
-        if uri.scheme == 'chefzero' && !ChefZero::SocketlessServerMap.server_on_port(uri.port).server
+        if @never_forward_localhost
+          return uri.to_s
+        elsif uri.scheme == 'chefzero' && !ChefZero::SocketlessServerMap.server_on_port(uri.port).server
           # There is no .server for a socketless, for a socket-d server it would
           # be a WEBrick::HTTPServer object.
           raise 'Cannot forward a socketless Chef Zero server, see https://docs.chef.io/deprecations_local_listen.html for more information'

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh