knife-azure 1.5.1.rc.3 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fc55c1fbaf2cc4bd80b423e890dd8f1a596db8
-  data.tar.gz: e544e7914382050afd27505a2a9b5b783632d74c
+  metadata.gz: 611f6298817cb44acba68217bb0f4cb494ce8ec5
+  data.tar.gz: 6ae5e4ece790fef2169048b65cc8cce43b6d1a33
 SHA512:
-  metadata.gz: a46c128551f942d67344bdfd08ec04a8c9f658e5ca636de4753fd6b7cc7868782c3486cfa8ddc8c5a189cdf8a42e01a3696be9133c0d34623b9913050a83203d
-  data.tar.gz: 3827001e16fc6bda9bcd51578e1dfef1bbb520f38df6d33eb33f56583b29e23700102f3fcd68a8b37e98b586a26ab7961fd6de0ade6c4fa7222f656e0e6bb5b0
+  metadata.gz: 00339f1a2006e09aa8f293d41bca859e9bf69e2010b8bd0ed671ca3bd46b16c9aaad83d1dd69c473777a7d70fc5000eff2b77b374ba5865016ce9e4ebc698735
+  data.tar.gz: 4147e95dc4f060bae0f3ad6924e9cd26a81041e6167547b8f7741fd3c571447d72a278316c868bc4cd2be6273e2878e5fc187cc1f4cfb40064d9036ae64b983a

data/lib/chef/knife/azure_server_create.rb

@@ -717,7 +717,7 @@ class Chef
         bootstrap.config[:first_boot_attributes] = locate_config_value(:json_attributes) || {}
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         bootstrap.config[:distro] = locate_config_value(:distro) || default_bootstrap_template
-        # setting bootstrap_template value to template_file for backward 
+        # setting bootstrap_template value to template_file for backward
         bootstrap.config[:template_file] = locate_config_value(:template_file) || locate_config_value(:bootstrap_template)
         bootstrap.config[:node_ssl_verify_mode] = locate_config_value(:node_ssl_verify_mode)
         bootstrap.config[:node_verify_api_cert] = locate_config_value(:node_verify_api_cert)
@@ -875,17 +875,17 @@ class Chef
         }
         # If user is connecting a new VM to an existing dns, then
         # the VM needs to have a unique public port. Logic below takes care of this.
-        if !is_image_windows? or locate_config_value(:bootstrap_protocol) == 'ssh'
+        if is_image_windows? && locate_config_value(:bootstrap_protocol) == 'winrm'
           if locate_config_value(:azure_connect_to_existing_dns)
-            port = locate_config_value(:ssh_port) || Random.rand(64000) + 1000
+            port = locate_config_value(:winrm_port) || Random.rand(64000) + 1000
           else
-            port = locate_config_value(:ssh_port) || '22'
+            port = locate_config_value(:winrm_port) || '5985'
           end
-        else
+        elsif locate_config_value(:bootstrap_protocol) == 'ssh'
           if locate_config_value(:azure_connect_to_existing_dns)
-            port = locate_config_value(:winrm_port) || Random.rand(64000) + 1000
+            port = locate_config_value(:ssh_port) || Random.rand(64000) + 1000
           else
-            port = locate_config_value(:winrm_port) || '5985'
+            port = locate_config_value(:ssh_port) || '22'
           end
         end
         server_def[:port] = port

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.5.1.rc.3"
+    VERSION = "1.5.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-azure
 version: !ruby/object:Gem::Version
-  version: 1.5.1.rc.3
+  version: 1.5.2
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A plugin to the Chef knife tool for creating instances on the Microsoft Azure