knife-azure 1.1.2 → 1.1.4.rc.0

data/README.md

@@ -119,6 +119,7 @@ https://github.com/opscode/knife-windows#nodes
       :azure_connect_to_existing_dns    Set this flag to add the new VM to an existing
                                         deployment/service. Must give the name of the existing
                                         DNS correctly in the --azure-dns-name option
+      :azure_availability_set           Optional. Name of availability set to add virtual machine into.
 
 #### Azure VM Quick Create
 You can create a server with minimal configuration. On the Azure Management Portal, this corresponds to a "Quick Create - VM". Sample command for quick create (for an Ubuntu instance):
@@ -219,11 +220,12 @@ Sample knife.rb for bootstrapping Windows Node with basic authentication
 ### Azure Server Delete Subcommand
 Deletes an existing server in the currently configured Azure account. By
 default, this does not delete the associated node and client objects from the
-Chef server. To do so, add the --purge flag. Also by default, the DNS name, also called "cloud service", is deleted if you are deleting the last VM from that service. By default, the OS disk is also deleted. If you want to retain them add the --preserve flag as shown below. To delete the storage account, add the --delete-azure-storage-account flag since by default the storage account is not deleted.
+Chef server. To do so, add the --purge flag. Also by default, the DNS name, also called "cloud service", is deleted if you are deleting the last VM from that service. By default, the OS disk is also deleted. The underlying VHD blob is also deleted by default. If you want to retain them add the --preserve flag as shown below. To delete the storage account, add the --delete-azure-storage-account flag since by default the storage account is not deleted.
 
     knife azure server delete "myvm01"
     knife azure server delete "myvm01" --purge  #purge chef node
     knife azure server delete "myvm01" --preserve-azure-os-disk
+    knife azure server delete "myvm01" --preserve-azure-vhd
     knife azure server delete "myvm01" --preserve-azure-dns-name
     knife azure server delete "myvm01" --delete-azure-storage-account
 

data/lib/azure/connection.rb

@@ -39,10 +39,10 @@ class Azure
       @disks = Disks.new(self)
       @certificates = Certificates.new(self)
     end
-    def query_azure(service_name, verb = 'get', body = '')
+    def query_azure(service_name, verb = 'get', body = '', params = '')
       Chef::Log.info 'calling ' + verb + ' ' + service_name
       Chef::Log.debug body unless body == ''
-      response = @rest.query_azure(service_name, verb, body)
+      response = @rest.query_azure(service_name, verb, body, params)
       if response.code.to_i == 200
         ret_val = Nokogiri::XML response.body
       elsif response.code.to_i >= 201 && response.code.to_i <= 299

data/lib/azure/deploy.rb

@@ -89,13 +89,18 @@ class Azure
         ret_val = deploy.create(params, deployXML)
       end
       if ret_val.css('Error Code').length > 0
-          Chef::Log.fatal 'Unable to create role:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
-          exit 1
+        raise Chef::Log.fatal 'Unable to create role:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
       end
       @connection.roles.find_in_hosted_service(params[:azure_vm_name], params[:azure_dns_name])
     end
     def delete(rolename)
     end
+    
+    def queryDeploy(hostedservicename)
+        deploy = Deploy.new(@connection)
+        deploy.retrieve(hostedservicename)
+        deploy
+    end
   end
 
   class Deploy
@@ -134,6 +139,9 @@ class Azure
           xml.DeploymentSlot 'Production'
           xml.Label Base64.encode64(params['deploy_name']).strip
           xml.RoleList { xml.Role('i:type'=>'PersistentVMRole') }
+          if params[:azure_network_name]
+            xml.VirtualNetworkName params[:azure_network_name]
+          end
         }
       end
       builder.doc.at_css('Role') << roleXML.at_css('PersistentVMRole').children.to_s

data/lib/azure/host.rb

@@ -120,7 +120,12 @@ class Azure
           xml.ServiceName params[:azure_dns_name]
           xml.Label Base64.encode64(params[:azure_dns_name])
           xml.Description 'Explicitly created hosted service'
-          xml.Location params[:azure_service_location] || 'West US'
+          unless params[:azure_service_location].nil?
+            xml.Location params[:azure_service_location]
+          end
+          unless params[:azure_affinity_group].nil?
+            xml.AffinityGroup params[:azure_affinity_group]
+          end
         }
       end
       @connection.query_azure("hostedservices", "post", builder.to_xml)

data/lib/azure/image.rb

@@ -51,12 +51,13 @@ end
 class Azure
   class Image
     attr_accessor :category, :label
-    attr_accessor :name, :os, :eula, :description
+    attr_accessor :name, :os, :eula, :description, :location
     def initialize(image)
       @category = image.at_css('Category').content
       @label = image.at_css('Label').content
       @name = image.at_css('Name').content
       @os = image.at_css('OS').content
+      @location = image.at_css('Location').content.gsub(";", ", ") if image.at_css('Location')
       @eula = image.at_css('Eula').content if image.at_css('Eula')
       @description = image.at_css('Description').content if image.at_css('Description')
     end

data/lib/azure/rest.rb

@@ -28,10 +28,11 @@ module AzureAPI
       @host_name = params[:azure_api_host_name]
       @verify_ssl = params[:verify_ssl_cert]
     end
-    def query_azure(service_name, verb = 'get', body = '')
+    def query_azure(service_name, verb = 'get', body = '', params = '')
       request_url = "https://#{@host_name}/#{@subscription_id}/services/#{service_name}"
       print '.'
       uri = URI.parse(request_url)
+      uri.query = params
       http = http_setup(uri)
       request = request_setup(uri, verb, body)
       response = http.request(request)
@@ -72,7 +73,7 @@ module AzureAPI
       elsif verb == 'delete'
         request = Net::HTTP::Delete.new(uri.request_uri)
       end
-      request["x-ms-version"] = "2012-03-01"
+      request["x-ms-version"] = "2013-03-01"
       request["content-type"] = "application/xml"
       request["accept"] = "application/xml"
       request["accept-charset"] = "utf-8"

data/lib/azure/role.rb

@@ -119,7 +119,12 @@ class Azure
              break if @connection.query_azure(servicecall, "get").search("AttachedTo").text == ""
              if attempt == 12 then puts "The associated disk could not be deleted due to time out." else sleep 25 end
           end
-          @connection.query_azure(servicecall, "delete")
+
+          unless params[:preserve_azure_vhd]
+           @connection.query_azure(servicecall, 'delete', '', 'comp=media')
+          else
+            @connection.query_azure(servicecall, 'delete')
+          end
 
           if params[:delete_azure_storage_account]
             storage_account_name = xml_content(storage_account, "MediaLink")
@@ -222,7 +227,7 @@ class Azure
               xml.AdminPassword params[:admin_password]
               xml.ResetPasswordOnFirstLogon 'false'
               xml.EnableAutomaticUpdates 'false'
-
+              xml.AdminUsername params[:winrm_user]
               }
             end
 
@@ -248,18 +253,24 @@ class Azure
             if params[:tcp_endpoints]
               params[:tcp_endpoints].split(',').each do |endpoint|
                 ports = endpoint.split(':')
-                xml.InputEndpoint {
-                  xml.LocalPort ports[0]
-                  xml.Name 'tcpport_' + ports[0] + '_' + params[:azure_vm_name]
-                  if ports.length > 1
-                    xml.Port ports[1]
-                  else
-                    xml.Port ports[0]
-                  end
-                  xml.Protocol 'TCP'
-                }
+                if !(ports.length > 1 && ports[1] == params[:port] || ports.length == 1 && ports[0] == params[:port])
+                  xml.InputEndpoint {
+                    xml.LocalPort ports[0]
+                    xml.Name 'tcpport_' + ports[0] + '_' + params[:azure_vm_name]
+                    if ports.length > 1
+                      xml.Port ports[1]
+                    else
+                      xml.Port ports[0]
+                    end
+                    xml.Protocol 'TCP'
+                  }
+                else
+                  warn_message = ports.length > 1 ? "#{ports.join(':')} because this ports are" : "#{ports[0]} because this port is"
+                  puts("Skipping tcp-endpoints: #{warn_message} already in use by ssh/winrm endpoint in current VM.")
+                end
               end
             end
+
             if params[:udp_endpoints]
               params[:udp_endpoints].split(',').each do |endpoint|
                 ports = endpoint.split(':')
@@ -276,8 +287,16 @@ class Azure
               end
             end
             }
+            if params[:azure_subnet_name]
+              xml.SubnetNames {
+                xml.SubnetName params[:azure_subnet_name]
+              }
+            end
           }
           }
+          if params[:azure_availability_set]
+            xml.AvailabilitySetName params[:azure_availability_set]
+          end
           xml.Label Base64.encode64(params[:azure_vm_name]).strip
           xml.OSVirtualHardDisk {
             disk_name = params[:azure_os_disk_name] || "disk_" + SecureRandom.uuid

data/lib/azure/storageaccount.rb

@@ -70,6 +70,13 @@ class Azure
         @connection.query_azure('storageaccounts/' + storage.name, 'delete')
       end
     end
+
+    def delete(name)
+      if self.exists?(name)
+          servicecall = "storageservices/" + name
+        @connection.query_azure(servicecall, "delete") 
+      end
+    end
   end
 end
 
@@ -99,7 +106,11 @@ class Azure
           xml.Label Base64.encode64(params[:azure_storage_account])
           xml.Description params[:azure_storage_account_description] || 'Explicitly created storage service'
           # Location defaults to 'West US'
-          xml.Location params[:azure_service_location] || 'West US'
+          if params[:azure_affinity_group]
+            xml.AffinityGroup params[:azure_affinity_group]
+          else 
+            xml.Location params[:azure_service_location] || 'West US'
+          end
         }
       end
       @connection.query_azure("storageservices", "post", builder.to_xml)

data/lib/chef/knife/azure_base.rb

@@ -98,6 +98,15 @@ class Chef
         end
       end
 
+      def msg_server_summary(server)
+        puts "\n"
+        msg_pair('DNS Name', server.hostedservicename + ".cloudapp.net")
+        msg_pair('VM Name', server.name)
+        msg_pair('Size', server.size)
+        msg_pair('Public Ip Address', server.publicipaddress)
+        puts "\n"
+      end
+
       def validate!(keys=[:azure_subscription_id, :azure_mgmt_cert, :azure_api_host_name])
         errors = []
         if(locate_config_value(:azure_mgmt_cert) != nil)

data/lib/chef/knife/azure_image_list.rb

@@ -44,7 +44,7 @@ class Chef
 
         validate!
 
-        image_labels = !locate_config_value(:show_all_fields) ? ['Name', 'OS'] : ['Name', 'Category', 'Label', 'OS'] 
+        image_labels = !locate_config_value(:show_all_fields) ? ['Name', 'OS', 'Location'] : ['Name', 'Category', 'Label', 'OS', 'Location'] 
         image_list =  image_labels.map {|label| ui.color(label, :bold)}          
         items = connection.images.all
 
@@ -54,7 +54,7 @@ class Chef
         end
 
         puts "\n"
-        puts h.list(image_list, :uneven_columns_across, !locate_config_value(:show_all_fields) ? 2 : 4) 
+        puts h.list(image_list, :uneven_columns_across, !locate_config_value(:show_all_fields) ? 3 : 5) 
 
       end
     end

data/lib/chef/knife/azure_server_create.rb

@@ -20,6 +20,8 @@
 
 require 'chef/knife/azure_base'
 require 'chef/knife/winrm_base'
+require 'securerandom'
+
 class Chef
   class Knife
     class AzureServerCreate < Knife
@@ -119,18 +121,23 @@ class Chef
       option :azure_vm_name,
         :long => "--azure-vm-name NAME",
         :description => "Required for advanced server-create option.
-                                      Specifies the name for the virtual machine. The name must be unique within the deployment."
+                                      Specifies the name for the virtual machine. The name must be unique within the deployment. The azure vm name cannot be more than 15 characters long"
 
       option :azure_service_location,
         :short => "-m LOCATION",
         :long => "--azure-service-location LOCATION",
-        :description => "Required. Specifies the geographic location - the name of the data center location that is valid for your subscription.
+        :description => "Required if not using an Affinity Group. Specifies the geographic location - the name of the data center location that is valid for your subscription.
                                       Eg: West US, East US, East Asia, Southeast Asia, North Europe, West Europe"
 
+      option :azure_affinity_group,
+        :short => "-a GROUP",
+        :long => "--azure-affinity-group GROUP",
+        :description => "Required if not using a Service Location. Specifies Affinity Group the VM should belong to."
+
       option :azure_dns_name,
         :short => "-d DNS_NAME",
         :long => "--azure-dns-name DNS_NAME",
-        :description => "Required. The DNS prefix name that can be used to access the cloud service which is unique within Windows Azure.
+        :description => "The DNS prefix name that can be used to access the cloud service which is unique within Windows Azure. Default is 'azure-dns-any_random_text'(e.g: azure-dns-be9b0f6f-7dda-456f-b2bf-4e28a3bc0add).
                                       If you want to add new VM to an existing service/deployment, specify an exiting dns-name,
                                       along with --azure-connect-to-existing-dns option.
                                       Otherwise a new deployment is created. For example, if the DNS of cloud service is MyService you could access the cloud service
@@ -153,6 +160,10 @@ class Chef
         :description => "Optional. Size of virtual machine (ExtraSmall, Small, Medium, Large, ExtraLarge)",
         :default => 'Small'
 
+      option :azure_availability_set,
+             :long => "--azure-availability-set NAME",
+             :description => "Optional. Name of availability set to add virtual machine into."
+
       option :tcp_endpoints,
         :short => "-t PORT_LIST",
         :long => "--tcp-endpoints PORT_LIST",
@@ -170,6 +181,15 @@ class Chef
         :default => false,
         :description => "Set this flag to add the new VM to an existing deployment/service. Must give the name of the existing
                                         DNS correctly in the --dns-name option"
+
+      option :azure_network_name,
+        :long => "--azure-network-name NETWORK_NAME",
+        :description => "Optional. Specifies the network of virtual machine"
+
+      option :azure_subnet_name,
+        :long => "--azure-subnet-name SUBNET_NAME",
+        :description => "Optional. Specifies the subnet of virtual machine"
+
       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"
@@ -195,6 +215,43 @@ class Chef
         (0...len).map{65.+(rand(25)).chr}.join
       end
 
+      def wait_until_virtual_machine_ready(total_wait_time_in_minutes = 15, retry_interval_in_seconds = 30)
+          print "\n#{ui.color('Waiting for virtual machine to be ready.', :magenta)}"
+          total_wait_time_in_seconds = total_wait_time_in_minutes * 60
+          max_polling_attempts = total_wait_time_in_seconds / retry_interval_in_seconds
+
+          wait_start_time = Time.now
+
+          vm_ready = check_if_virtual_machine_ready()
+          polling_attempts = 1
+          until vm_ready || polling_attempts >= max_polling_attempts
+            print '.'
+            sleep retry_interval_in_seconds
+            vm_ready = check_if_virtual_machine_ready()
+            polling_attempts += 1
+          end
+          if vm_ready
+            elapsed_time_in_minutes = ((Time.now - wait_start_time) / 60).round(2)
+            puts("vm ready after #{elapsed_time_in_minutes} minutes.")
+          else
+            raise "Virtual machine not ready after #{total_wait_time_in_minutes} minutes."
+          end
+      end
+
+      def check_if_virtual_machine_ready()
+        deploy = connection.deploys.queryDeploy(locate_config_value(:azure_dns_name))
+        role = deploy.find_role(locate_config_value(:azure_vm_name))
+        if role.nil?
+          raise "Could not find role - status unknown."
+        end
+        Chef::Log.debug("Role status is #{role.status.to_s}")
+        if  "ReadyRole".eql? role.status.to_s
+          return true
+        else
+          return false
+        end
+      end
+
       def tcp_test_winrm(ip_addr, port)
 	    hostname = ip_addr
         socket = TCPSocket.new(hostname, port)
@@ -253,66 +310,87 @@ class Chef
 
         Chef::Log.info("creating...")
 
+        config[:azure_dns_name] = get_dns_name(locate_config_value(:azure_dns_name))
         if not locate_config_value(:azure_vm_name)
           config[:azure_vm_name] = locate_config_value(:azure_dns_name)
         end
 
+        remove_hosted_service_on_failure = locate_config_value(:azure_dns_name)
+        if connection.hosts.exists?(locate_config_value(:azure_dns_name))
+          remove_hosted_service_on_failure = nil
+        end
+        remove_storage_service_on_failure = locate_config_value(:azure_storage_account)
+
         #If Storage Account is not specified, check if the geographic location has one to re-use
         if not locate_config_value(:azure_storage_account)
           storage_accts = connection.storageaccounts.all
           storage = storage_accts.find { |storage_acct| storage_acct.location.to_s == locate_config_value(:azure_service_location) }
           if not storage
             config[:azure_storage_account] = [strip_non_ascii(locate_config_value(:azure_vm_name)), random_string].join.downcase
+            remove_storage_service_on_failure = config[:azure_storage_account]
           else
+            remove_storage_service_on_failure = nil
             config[:azure_storage_account] = storage.name.to_s
           end
         end
 
-        server = connection.deploys.create(create_server_def)
-        fqdn = server.publicipaddress
+        begin
+          server = connection.deploys.create(create_server_def)
+          fqdn = server.publicipaddress
+          wait_until_virtual_machine_ready()
+        rescue Exception => e
+          Chef::Log.error("Failed to create the server -- exception being rescued: #{e.to_s}")
+          cleanup_and_exit(remove_hosted_service_on_failure, remove_storage_service_on_failure)
+        end
+
+        msg_server_summary(server)
 
-        puts("\n")
         if is_image_windows?
+          # Set distro to windows-chef-client-msi
+          config[:distro] = "windows-chef-client-msi" if (config[:distro].nil? || config[:distro] == "chef-full")
+
           if locate_config_value(:bootstrap_protocol) == 'ssh'
             port = server.sshport
-            print "\n#{ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)}"
+            print "#{ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)}"
 
             print(".") until tcp_test_ssh(fqdn,port) {
               sleep @initial_sleep_delay ||= 10
               puts("done")
-           }
+            }
 
           elsif locate_config_value(:bootstrap_protocol) == 'winrm'
             port = server.winrmport
 
-            print "\n#{ui.color("Waiting for winrm on #{fqdn}:#{port}", :magenta)}"
+            print "#{ui.color("Waiting for winrm on #{fqdn}:#{port}", :magenta)}"
 
             print(".") until tcp_test_winrm(fqdn,port) {
               sleep @initial_sleep_delay ||= 10
               puts("done")
-           }
-
+            }
           end
-          sleep 15
+        
+          puts("\n")
           bootstrap_for_windows_node(server,fqdn, port).run
         else
           unless server && server.publicipaddress && server.sshport
             Chef::Log.fatal("server not created")
-          exit 1
-        end
+            exit 1
+          end
 
-        port = server.sshport
+          port = server.sshport
 
-        print "\n#{ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)}"
+          print "#{ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)}"
 
-        print(".") until tcp_test_ssh(fqdn,port) {
-          sleep @initial_sleep_delay ||= 10
-          puts("done")
-        }
+          print(".") until tcp_test_ssh(fqdn,port) {
+            sleep @initial_sleep_delay ||= 10
+            puts("done")
+          }
 
-        sleep 15
+          puts("\n")
           bootstrap_for_node(server,fqdn,port).run
         end
+
+        msg_server_summary(server)
       end
 
       def load_cloud_attributes_in_hints(server)
@@ -371,8 +449,8 @@ class Chef
         end
         bootstrap.name_args = [fqdn]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.name
-        bootstrap.config[:encrypted_data_bag_secret] = config[:encrypted_data_bag_secret]
-        bootstrap.config[:encrypted_data_bag_secret_file] = config[:encrypted_data_bag_secret_file]
+        bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:encrypted_data_bag_secret)
+        bootstrap.config[:encrypted_data_bag_secret_file] = locate_config_value(:encrypted_data_bag_secret_file)
         bootstrap_common_params(bootstrap, server)
       end
 
@@ -394,6 +472,8 @@ class Chef
         bootstrap.config[:environment] = locate_config_value(:environment)
         # may be needed for vpc_mode
         bootstrap.config[:host_key_verify] = config[:host_key_verify]
+        bootstrap.config[:secret] = locate_config_value(:secret)
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file)
 
         # Load cloud attributes.
         load_cloud_attributes_in_hints(server)
@@ -406,8 +486,6 @@ class Chef
               :azure_subscription_id,
               :azure_mgmt_cert,
               :azure_api_host_name,
-              :azure_dns_name,
-              :azure_service_location,
               :azure_source_image,
               :azure_vm_size,
         ])
@@ -415,6 +493,13 @@ class Chef
           ui.error("Specify the VM name using --azure-vm-name option, since you are connecting to existing dns")
           exit 1
         end
+        if locate_config_value(:azure_service_location) && locate_config_value(:azure_affinity_group)
+          ui.error("Cannot specify both --azure_service_location and --azure_affinity_group, use one or the other.")
+          exit 1
+        elsif locate_config_value(:azure_service_location).nil? && locate_config_value(:azure_affinity_group).nil?
+          ui.error("Must specify either --azure_service_location or --azure_affinity_group.")
+          exit 1
+        end
       end
 
       def create_server_def
@@ -429,7 +514,12 @@ class Chef
           :tcp_endpoints => locate_config_value(:tcp_endpoints),
           :udp_endpoints => locate_config_value(:udp_endpoints),
           :bootstrap_proto => locate_config_value(:bootstrap_protocol),
-          :azure_connect_to_existing_dns => locate_config_value(:azure_connect_to_existing_dns)
+          :azure_connect_to_existing_dns => locate_config_value(:azure_connect_to_existing_dns),
+          :winrm_user => locate_config_value(:winrm_user),
+          :azure_availability_set => locate_config_value(:azure_availability_set),
+          :azure_affinity_group => locate_config_value(:azure_affinity_group),
+          :azure_network_name => locate_config_value(:azure_network_name),
+          :azure_subnet_name => locate_config_value(:azure_subnet_name)
         }
         # 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.
@@ -450,6 +540,14 @@ class Chef
           server_def[:os_type] = 'Windows'
           if not locate_config_value(:winrm_password) or not locate_config_value(:bootstrap_protocol)
             ui.error("WinRM Password and Bootstrapping Protocol are compulsory parameters")
+            exit 1
+          end
+          # We can specify the AdminUsername after API version 2013-03-01. However, in this API version,
+          # the AdminUsername is a required parameter.
+          # Also, the user name cannot be Administrator, Admin, Admin1 etc, for enhanced security (provided by Azure)
+          if locate_config_value(:winrm_user).nil? || locate_config_value(:winrm_user).downcase =~ /admin*/
+            ui.error("WinRM User is compulsory parameter and it cannot be named 'admin*'")
+            exit
           end
           server_def[:admin_password] = locate_config_value(:winrm_password)
           server_def[:bootstrap_proto] = locate_config_value(:bootstrap_protocol)
@@ -472,7 +570,32 @@ class Chef
         end
         server_def
       end
+
+      def cleanup_and_exit(remove_hosted_service_on_failure, remove_storage_service_on_failure)
+        if remove_hosted_service_on_failure
+          connection.hosts.delete(remove_hosted_service_on_failure)
+        end
+        if remove_storage_service_on_failure
+          connection.storageaccounts.delete(remove_storage_service_on_failure)
+        end
+        exit 1
+      end
+      
+      private
+      # This is related to Windows VM's specifically and computer name
+      # length limits for legacy computer accounts
+      MAX_VM_NAME_CHARACTERS = 15
+
+      # generate a random dns_name if azure_dns_name is empty
+      def get_dns_name(azure_dns_name, prefix = "az-")
+        return azure_dns_name unless azure_dns_name.nil?
+        if locate_config_value(:azure_vm_name).nil?
+          azure_dns_name = prefix + SecureRandom.hex(( MAX_VM_NAME_CHARACTERS - prefix.length)/2)
+        else
+          azure_dns_name = prefix + locate_config_value(:azure_vm_name)
+        end
+      end
+
     end
   end
 end
-

data/lib/chef/knife/azure_server_delete.rb

@@ -38,6 +38,12 @@ class Chef
         :default => false,
         :description => "Preserve corresponding OS Disk"
 
+      option :preserve_azure_vhd,
+       :long => "--preserve-azure-vhd",
+       :boolean => true,
+       :default => false,
+       :description => "Preserve underlying VHD"
+
       option :purge,
         :short => "-P",
         :long => "--purge",
@@ -118,6 +124,7 @@ class Chef
             end
 
             connection.roles.delete(name, params = { :preserve_azure_os_disk => locate_config_value(:preserve_azure_os_disk),
+                                                     :preserve_azure_vhd => locate_config_value(:preserve_azure_vhd),
                                                      :preserve_azure_dns_name => locate_config_value(:preserve_azure_dns_name),
                                                      :azure_dns_name => server.hostedservicename,
                                                      :delete_azure_storage_account => locate_config_value(:delete_azure_storage_account) })

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.1.2"
+    VERSION = "1.1.4.rc.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: knife-azure
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.1.4.rc.0
+  prerelease: 6
 platform: ruby
 authors:
 - Barry Davis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -97,7 +97,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
@@ -105,7 +105,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
 - !ruby/object:Gem::Dependency
@@ -124,6 +124,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-config
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A plugin to Opscode knife for creating instances on the Microsoft Azure
   platform
 email: oss@opscode.com
@@ -166,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1596077527808051330
+      hash: 4192859344861281444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: