knife-azure 1.4.0.rc.1 → 1.4.0.rc.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzljMjVkNDdjMGI2MWJmMjBlZmU1ZWYxNTY4MDcxY2IxMDI1YzU3YQ==
-  data.tar.gz: !binary |-
-    MDg0MDc2ZTcwMTA4MTViYzI0MWVhYTkwZmZjNzUyOGUxMDcxYzI1ZA==
+SHA1:
+  metadata.gz: 43b48e02d2410e604570e6926249b266d9725b71
+  data.tar.gz: 91ebe2ea139695d092439ec21416daab45b77984
 SHA512:
-  metadata.gz: !binary |-
-    OWRhN2NiMjQ3ZjRlM2NiMDVhZTYwMjI5MGY3YjIwMmEyMTJjM2E2MGZkZTUw
-    YzU3NDU4ZDY3NjkzYzQwZjFlMmRjYTQyYzRkNWUyMzA3YjUzMjM4NzgwNGQ5
-    ZGZhMjdjYzY2YTZhZDZlYjYyZjgyMzJjNmQ5Zjk0YTQ3M2NkNzY=
-  data.tar.gz: !binary |-
-    NjQ1NWFiYzZjMTU3ZWU0YmNlY2JmYzM0MDI2ZDdlZWNmZTJkZTcxY2IwYzU4
-    NGY0MzMyNTE5MjZlNmRlMjI4YmM1Y2RkOTNjZWQyMmE0NGYzNTY4YTE3YWNm
-    NDI5ODU3ZTllNWNkM2QwMTcyMGMwNzAyMjk2NWRhMjBiMzdhOWE=
+  metadata.gz: acdc4444674627bdaa434f5070620f61202c2271cef6563d6478343fba5a8ea4e7a91a1b9bc23981a72c0b26bed78831bc326b5828793fb41a1a8799797b05de
+  data.tar.gz: 2d867a11335104e29437601789d3794156ac3ef11f84b8adf45146dce16a9017a70aaf6d4e855531ed825618e1485fb25af7d8723e96a54b2ad68703eff0787a

data/lib/azure/deploy.rb

@@ -82,8 +82,7 @@ class Azure
         cert_data = File.read (params[:cert_path])
         @connection.certificates.add cert_data, params[:cert_password], 'pfx', params[:azure_dns_name]
       elsif(params[:winrm_transport] == "ssl")
-        thumbprint = @connection.certificates.create_ssl_certificate params[:azure_dns_name]
-        params[:ssl_cert_fingerprint] = thumbprint.to_s.upcase
+        #TODO: generate certificates for ssl listener
       end
 
       params['deploy_name'] = get_deploy_name_for_hostedservice(params[:azure_dns_name])

data/lib/chef/knife/azure_server_create.rb

@@ -200,6 +200,11 @@ class Chef
         :description => "The number of minutes that knife-azure will wait for the virtual machine state to transition from 'provisioning' to 'ready'. Default is 15.",
         :default => 15 
 
+      option :auth_timeout,
+        :long => "--windows-auth-timeout MINUTES",
+        :description => "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 25 minutes.",
+        :default => 25
+
       option :identity_file,
         :long => "--identity-file FILENAME",
         :description => "SSH identity file for authentication, optional. It is the RSA private key path. Specify either ssh-password or identity-file"
@@ -260,7 +265,12 @@ class Chef
           azure_vm_ready_timeout = locate_config_value(:azure_vm_ready_timeout).to_i
           vm_status = wait_for_virtual_machine_state(:vm_status_provisioning, azure_vm_startup_timeout, retry_interval_in_seconds)
           if vm_status != :vm_status_ready
-            wait_for_virtual_machine_state(:vm_status_ready, azure_vm_ready_timeout, retry_interval_in_seconds)
+            begin
+              wait_for_virtual_machine_state(:vm_status_ready, azure_vm_ready_timeout, retry_interval_in_seconds)
+            rescue Chef::Exceptions::CommandTimeout => e
+              ui.warn("\n#{e.message}")
+              ui.warn("Ignoring failure to reach 'ready' with bootstrap.")
+            end
           end
 
           msg_server_summary(get_role_server())
@@ -611,6 +621,7 @@ class Chef
             bootstrap.config[:winrm_transport] = locate_config_value(:winrm_transport)
             bootstrap.config[:winrm_authentication_protocol] = locate_config_value(:winrm_authentication_protocol)
             bootstrap.config[:winrm_port] = port
+            bootstrap.config[:auth_timeout] = locate_config_value(:auth_timeout)
 
         elsif locate_config_value(:bootstrap_protocol) == 'ssh'
             bootstrap = Chef::Knife::BootstrapWindowsSsh.new

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.4.0.rc.1"
+    VERSION = "1.4.0.rc.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.4.0.rc.1
+  version: 1.4.0.rc.2
 platform: ruby
 authors:
 - Barry Davis
@@ -9,96 +9,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.8.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.8.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '12'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: A plugin to the Chef knife tool for creating instances on the Microsoft
@@ -144,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A plugin to the Chef knife tool for creating instances on the Microsoft Azure