vagrant-azure 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5597d47adf91f7395f8b3bec4ab45ca51218f47
-  data.tar.gz: cb149fbf31e95c1657581e0e213e31bf65c2a63f
+  metadata.gz: 5bec96dd4b99f7a5bf92f5d5b8056b1ce4885d44
+  data.tar.gz: aa65b0f1615ae25b591ffd59efd462332ea4de93
 SHA512:
-  metadata.gz: 1429363e9a70658d9960c7ba9689e8be3fea33ae6a5d4d21731c31d84af5f8d278f7617be87ebab4cd40ec1502a7db32d120dc9b40de32fd766d92bd30376d1b
-  data.tar.gz: 7d32bd43eed9cedd13938d10f4fe0665330cf03b3698cadbda007c9e0e615f9953d3a1e15bb67b7250f51baa53aae464b4f8a6c3939a01b174e9983e2bd922ab
+  metadata.gz: 5f838e34d66d8795e0b0dc00ad4f2529ad230f996e06923ba37adb4e1d16403c263dfca156d292ccc204c5e63ec39fe63491474f8164e8e0efbfc515a90457e2
+  data.tar.gz: 3e057b8906ad18b76e15dcf5f8a674bbaa3b050880de1e5e4a188a1efa07c0d811fee2b4e2c855764862bf1b2a8fc151372d4d6709ce252f1eb7f01ac1defe21

data/Gemfile

@@ -10,10 +10,10 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.4'
-  gem 'dotenv'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'bundler', '~>1.10.5'
 end
 
 group :plugins do
   gem 'vagrant-azure', path: '.'
-end
+end

data/README.md

@@ -7,14 +7,14 @@ provider to Vagrant, allowing Vagrant to control and provision machines in Micro
 
 ## Usage
 
-Install Vagrant 1.7.3 or higher - [Download Vagrant](http://www.vagrantup.com/downloads.html)
+[Download Vagrant](http://www.vagrantup.com/downloads.html)
 
 Install the vagrant-azure plugin using the standard Vagrant 1.1+ installation methods. After installing the plugin, you can ```vagrant up``` and use ```azure``` provider. For example:
 
 ```
-C:\> vagrant plugin install vagrant-azure 2.0.0.pre1
+vagrant plugin install vagrant-azure --plugin-version '2.0.0.pre1' --plugin-prerelease
 ...
-C:\> vagrant up --provider=azure
+vagrant up --provider=azure
 ...
 ```
 
@@ -25,7 +25,7 @@ You'll need an ```azure``` box before you can do ```vagrant up``` though.
 You can use the dummy box and specify all the required details manually in the ```config.vm.provider``` block in your ```Vagrantfile```. Add the dummy box with the name you want:
 
 ```
-C:\> vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box
+vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box
 ...
 ```
 
@@ -55,7 +55,7 @@ end
 Now you can run
 
 ```
-C:\> vagrant up --provider=azure
+vagrant up --provider=azure
 ```
 
 This will bring up an Azure VM as per the configuration options set above.
@@ -87,8 +87,8 @@ For instructions on how to setup an Azure Active Directory Application see: http
 * `location`: (Optional) Azure location to build the VM -- defaults to 'westus'
 * `vm_name`: (Optional) Name of the virtual machine
 * `vm_password`: (Optional for *nix) Password for the VM -- This is not recommended for *nix deployments
-* `vm_size`: (Optional) VM size to be used -- defaults to 'Standard_D1'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-sizes/
-* `vm_image_urn`: (Optional) Name of the virtual machine image urn to use -- defaults to 'canonical:ubuntuserver:16.04.0-DAILY-LTS:latest'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/
+* `vm_size`: (Optional) VM size to be used -- defaults to 'Standard_DS2_v2'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-sizes/
+* `vm_image_urn`: (Optional) Name of the virtual machine image urn to use -- defaults to 'canonical:ubuntuserver:16.04-LTS:latest'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/
 * `virtual_network_name`: (Optional) Name of the virtual network resource
 * `subnet_name`: (Optional) Name of the virtual network subnet resource
 * `instance_ready_timeout`: (Optional) The timeout to wait for an instance to become ready -- default 120 seconds.

data/Rakefile

@@ -4,6 +4,7 @@
 
 require 'rubygems'
 require 'bundler/setup'
+require 'rspec/core/rake_task'
 
 $stdout.sync = true
 $stderr.sync = true
@@ -11,3 +12,10 @@ $stderr.sync = true
 Dir.chdir(File.expand_path('../', __FILE__))
 
 Bundler::GemHelper.install_tasks
+
+# Install the `spec` task so that we can run tests.
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--order defined'
+end
+# Default task is to run the unit tests
+task :default => :spec

data/lib/vagrant-azure/action.rb

@@ -75,6 +75,16 @@ module VagrantPlugins
         end
       end
 
+      # This action is called to read the WinRM info of the machine. The
+      # resulting state is expected to be put into the `:machine_winrm_info` key.
+      def self.action_read_winrm_info
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectAzure
+          b.use ReadWinrmInfo
+        end
+      end
+
       # This action is called to read the state of the machine. The
       # resulting state is expected to be put into the `:machine_state_id`
       # key.
@@ -178,6 +188,7 @@ module VagrantPlugins
       autoload :MessageNotCreated, action_root.join('message_not_created')
       autoload :MessageWillNotDestroy, action_root.join('message_will_not_destroy')
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadWinrmInfo, action_root.join('read_winrm_info')
       autoload :ReadState, action_root.join('read_state')
       autoload :RestartVM, action_root.join('restart_vm')
       autoload :RunInstance, action_root.join('run_instance')

data/lib/vagrant-azure/action/read_ssh_info.rb

@@ -24,9 +24,9 @@ module VagrantPlugins
         def read_ssh_info(azure, env)
           return nil if env[:machine].id.nil?
           parsed = parse_machine_id(env[:machine].id)
-          public_ip = azure.network.public_ipaddresses.get(parsed[:group], "#{parsed[:name]}-vagrantPublicIP").value!.body
+          public_ip = azure.network.public_ipaddresses.get(parsed[:group], "#{parsed[:name]}-vagrantPublicIP")
 
-          {:host => public_ip.properties.dns_settings.fqdn, :port => 22}
+          {:host => public_ip.dns_settings.fqdn, :port => 22}
         end
       end
     end

data/lib/vagrant-azure/action/read_state.rb

@@ -29,9 +29,9 @@ module VagrantPlugins
           parsed = parse_machine_id(machine.id)
           vm = nil
           begin
-            vm = azure.compute.virtual_machines.get(parsed[:group], parsed[:name], 'instanceView').value!.body
+            vm = azure.compute.virtual_machines.get(parsed[:group], parsed[:name], 'instanceView')
           rescue MsRestAzure::AzureOperationError => ex
-            if vm.nil? || tearing_down?(vm.properties.instance_view.statuses)
+            if vm.nil? || tearing_down?(vm.instance_view.statuses)
               # The machine can't be found
               @logger.info('Machine not found or terminated, assuming it got destroyed.')
               machine.id = nil
@@ -40,7 +40,7 @@ module VagrantPlugins
           end
 
           # Return the state
-          power_state(vm.properties.instance_view.statuses)
+          power_state(vm.instance_view.statuses)
         end
 
       end

data/lib/vagrant-azure/action/read_winrm_info.rb

@@ -0,0 +1,38 @@
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'vagrant-azure/util/machine_id_helper'
+
+module VagrantPlugins
+  module Azure
+    module Action
+      class ReadWinrmInfo
+        include VagrantPlugins::Azure::Util::MachineIdHelper
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::read_winrm_info')
+        end
+
+        def call(env)
+          if env[:machine].config.vm.guest == :windows
+            env[:machine_winrm_info] = read_winrm_info(env[:azure_arm_service], env)
+          end
+
+          @app.call(env)
+        end
+
+        def read_winrm_info(azure, env)
+          return nil if env[:machine].id.nil?
+          parsed = parse_machine_id(env[:machine].id)
+          public_ip = azure.network.public_ipaddresses.get(parsed[:group], "#{parsed[:name]}-vagrantPublicIP")
+
+          {:host => public_ip.dns_settings.fqdn, :port => env[:machine].config.winrm.port}
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/run_instance.rb

@@ -28,18 +28,25 @@ module VagrantPlugins
           machine = env[:machine]
 
           # Get the configs
-          config                    = machine.provider_config
-          endpoint                  = config.endpoint
-          resource_group_name       = config.resource_group_name
-          location                  = config.location
-          vm_name                   = config.vm_name
-          vm_password               = config.vm_password
-          vm_size                   = config.vm_size
-          vm_image_urn              = config.vm_image_urn
-          virtual_network_name      = config.virtual_network_name
-          subnet_name               = config.subnet_name
-          tcp_endpoints             = config.tcp_endpoints
-          availability_set_name     = config.availability_set_name
+          config                         = machine.provider_config
+          endpoint                       = config.endpoint
+          resource_group_name            = config.resource_group_name
+          location                       = config.location
+          ssh_user_name                  = machine.config.ssh.username
+          vm_name                        = config.vm_name
+          vm_password                    = config.vm_password
+          vm_size                        = config.vm_size
+          vm_image_urn                   = config.vm_image_urn
+          virtual_network_name           = config.virtual_network_name
+          subnet_name                    = config.subnet_name
+          tcp_endpoints                  = config.tcp_endpoints
+          availability_set_name          = config.availability_set_name
+          admin_user_name                = config.admin_username
+          admin_password                 = config.admin_password
+          winrm_port                     = machine.config.winrm.port
+          winrm_install_self_signed_cert = config.winrm_install_self_signed_cert
+          dns_label_prefix               = Haikunator.haikunate(100)
+          deployment_template            = config.deployment_template
 
           # Launch!
           env[:ui].info(I18n.t('vagrant_azure.launching_instance'))
@@ -47,6 +54,8 @@ module VagrantPlugins
           env[:ui].info(" -- Subscription Id: #{config.subscription_id}")
           env[:ui].info(" -- Resource Group Name: #{resource_group_name}")
           env[:ui].info(" -- Location: #{location}")
+          env[:ui].info(" -- SSH User Name: #{ssh_user_name}") if ssh_user_name
+          env[:ui].info(" -- Admin Username: #{admin_user_name}") if admin_user_name
           env[:ui].info(" -- VM Name: #{vm_name}")
           env[:ui].info(" -- VM Size: #{vm_size}")
           env[:ui].info(" -- Image URN: #{vm_image_urn}")
@@ -54,6 +63,7 @@ module VagrantPlugins
           env[:ui].info(" -- Subnet Name: #{subnet_name}") if subnet_name
           env[:ui].info(" -- TCP Endpoints: #{tcp_endpoints}") if tcp_endpoints
           env[:ui].info(" -- Availability Set Name: #{availability_set_name}") if availability_set_name
+          env[:ui].info(" -- DNS Label Prefix: #{dns_label_prefix}")
 
           image_publisher, image_offer, image_sku, image_version = vm_image_urn.split(':')
 
@@ -65,7 +75,7 @@ module VagrantPlugins
           @logger.info("Time to fetch os image details: #{env[:metrics]['get_image_details']}")
 
           deployment_params = {
-            dnsLabelPrefix:       Haikunator.haikunate(100),
+            dnsLabelPrefix:       dns_label_prefix,
             vmSize:               vm_size,
             vmName:               vm_name,
             imagePublisher:       image_publisher,
@@ -73,24 +83,46 @@ module VagrantPlugins
             imageSku:             image_sku,
             imageVersion:         image_version,
             subnetName:           subnet_name,
-            virtualNetworkName:   virtual_network_name
+            virtualNetworkName:   virtual_network_name,
           }
 
-          if get_image_os(image_details) != 'Windows'
+          # we need to pass different parameters depending upon the OS
+          operating_system = get_image_os(image_details)
+
+          template_params = {
+            operating_system:               operating_system,
+            winrm_install_self_signed_cert: winrm_install_self_signed_cert,
+            winrm_port:                     winrm_port,
+            dns_label_prefix:               dns_label_prefix,
+            location:                       location,
+            deployment_template:            deployment_template
+          }
+
+          if operating_system != 'Windows'
             private_key_paths = machine.config.ssh.private_key_path
-            if private_key_paths.empty?
+            if private_key_paths.nil? || private_key_paths.empty?
               raise I18n.t('vagrant_azure.private_key_not_specified')
             end
 
             paths_to_pub = private_key_paths.map{ |k| File.expand_path( k + '.pub') }.select{ |p| File.exists?(p) }
             raise I18n.t('vagrant_azure.public_key_path_private_key', private_key_paths.join(', ')) if paths_to_pub.empty?
+            deployment_params.merge!(adminUsername:  ssh_user_name)
             deployment_params.merge!(sshKeyData: File.read(paths_to_pub.first))
+            communicator_message = 'vagrant_azure.waiting_for_ssh'
+          else
+            env[:machine].config.vm.communicator = :winrm
+            machine.config.winrm.port = winrm_port
+            machine.config.winrm.username = admin_user_name
+            machine.config.winrm.password = admin_password
+            communicator_message = 'vagrant_azure.waiting_for_winrm'
+            windows_params = {
+              adminUsername:  admin_user_name,
+              adminPassword:  admin_password,
+              winRmPort:      winrm_port
+            }
+            deployment_params.merge!(windows_params)
           end
 
-          template_params = {
-              operating_system:   get_image_os(image_details)
-          }
-
           env[:ui].info(" -- Create or Update of Resource Group: #{resource_group_name}")
           env[:metrics]['put_resource_group'] = Util::Timer.time do
             put_resource_group(azure, resource_group_name, location)
@@ -99,11 +131,11 @@ module VagrantPlugins
 
           deployment_params = build_deployment_params(template_params, deployment_params.reject{|_,v| v.nil?})
 
-          env[:ui].info('Starting deployment')
+          env[:ui].info(' -- Starting deployment')
           env[:metrics]['deployment_time'] = Util::Timer.time do
             put_deployment(azure, resource_group_name, deployment_params)
           end
-          env[:ui].info('Finished deploying')
+          env[:ui].info(' -- Finished deploying')
 
           # Immediately save the ID since it is created at this point.
           env[:machine].id = serialize_machine_id(resource_group_name, vm_name, location)
@@ -111,8 +143,8 @@ module VagrantPlugins
           @logger.info("Time to deploy: #{env[:metrics]['deployment_time']}")
           unless env[:interrupted]
             env[:metrics]['instance_ssh_time'] = Util::Timer.time do
-              # Wait for SSH to be ready.
-              env[:ui].info(I18n.t('vagrant_azure.waiting_for_ssh'))
+              # Wait for SSH/WinRM to be ready.
+              env[:ui].info(I18n.t(communicator_message))
               network_ready_retries = 0
               network_ready_retries_max = 10
               while true
@@ -122,7 +154,7 @@ module VagrantPlugins
                 rescue Exception => e
                   if network_ready_retries < network_ready_retries_max
                     network_ready_retries += 1
-                    @logger.warn(I18n.t('vagrant_azure.waiting_for_ssh, retrying'))
+                    @logger.warn(I18n.t("#{communicator_message}, retrying"))
                   else
                     raise e
                   end
@@ -131,10 +163,10 @@ module VagrantPlugins
               end
             end
 
-            @logger.info("Time for SSH ready: #{env[:metrics]['instance_ssh_time']}")
+            @logger.info("Time for SSH/WinRM ready: #{env[:metrics]['instance_ssh_time']}")
 
             # Ready and booted!
-            env[:ui].info(I18n.t('vagrant_azure.ready'))
+            env[:ui].info(I18n.t('vagrant_azure.ready')) unless env[:interrupted]
           end
 
           # Terminate the instance if we were interrupted
@@ -144,20 +176,21 @@ module VagrantPlugins
         end
 
         def get_image_os(image_details)
-          image_details.properties.os_disk_image.operating_system
+          image_details.os_disk_image.operating_system
         end
 
         def get_image_details(azure, location, publisher, offer, sku, version)
           if version == 'latest'
-            latest = azure.compute.virtual_machine_images.list(location, publisher, offer, sku).value!.body.last
-            azure.compute.virtual_machine_images.get(location, publisher, offer, sku, latest.name).value!.body
+            images = azure.compute.virtual_machine_images.list(location, publisher, offer, sku)
+            latest = images.sort_by(&:name).last
+            azure.compute.virtual_machine_images.get(location, publisher, offer, sku, latest.name)
           else
-            azure.compute.virtual_machine_images.get(location, publisher, offer, sku, version).value!.body
+            azure.compute.virtual_machine_images.get(location, publisher, offer, sku, version)
           end
         end
 
         def put_deployment(azure, rg_name, params)
-          azure.resources.deployments.create_or_update(rg_name, 'vagrant', params).value!.body
+          azure.resources.deployments.create_or_update(rg_name, 'vagrant', params)
         end
 
         def put_resource_group(azure, name, location)
@@ -165,18 +198,31 @@ module VagrantPlugins
             rg.location = location
           end
 
-          azure.resources.resource_groups.create_or_update(name, params).value!.body
+          azure.resources.resource_groups.create_or_update(name, params)
         end
 
         # This method generates the deployment template
         def render_deployment_template(options)
-          Vagrant::Util::TemplateRenderer.render('arm/deployment.json', options.merge(template_root: template_root))
+          self_signed_cert_resource = nil
+          if options[:operating_system] == 'Windows' && options[:winrm_install_self_signed_cert]
+            setup_winrm_powershell = Vagrant::Util::TemplateRenderer.render('arm/setup-winrm.ps1', options.merge({template_root: template_root}))
+            encoded_setup_winrm_powershell = setup_winrm_powershell.
+              gsub("'", "', variables('singleQuote'), '").
+              gsub("\r\n", "\n").
+              gsub("\n", "; ")
+            self_signed_cert_resource = Vagrant::Util::TemplateRenderer.render('arm/selfsignedcert.json', options.merge({template_root: template_root, setup_winrm_powershell: encoded_setup_winrm_powershell}))
+          end
+          Vagrant::Util::TemplateRenderer.render('arm/deployment.json', options.merge({ template_root: template_root, self_signed_cert_resource: self_signed_cert_resource}))
         end
 
         def build_deployment_params(template_params, deployment_params)
           params = ::Azure::ARM::Resources::Models::Deployment.new
           params.properties = ::Azure::ARM::Resources::Models::DeploymentProperties.new
-          params.properties.template = JSON.parse(render_deployment_template(template_params))
+          if template_params[:deployment_template].nil?
+            params.properties.template = JSON.parse(render_deployment_template(template_params))
+          else
+            params.properties.template = JSON.parse(template_params[:deployment_template])
+          end
           params.properties.mode = ::Azure::ARM::Resources::Models::DeploymentMode::Incremental
           params.properties.parameters = build_parameters(deployment_params)
           params

data/lib/vagrant-azure/action/start_instance.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_azure.waiting_for_ready'))
 
             task = await_true(env) do |vm|
-              running?(vm.properties.instance_view.statuses)
+              running?(vm.instance_view.statuses)
             end
 
             if task.value

data/lib/vagrant-azure/action/stop_instance.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
               env[:ui].info(I18n.t('vagrant_azure.waiting_for_stop'))
 
               task = await_true(env) do |vm|
-                stopped?(vm.properties.instance_view.statuses)
+                stopped?(vm.instance_view.statuses)
               end
 
               if task.value

data/lib/vagrant-azure/action/terminate_instance.rb

@@ -20,7 +20,11 @@ module VagrantPlugins
 
           begin
             env[:ui].info(I18n.t('vagrant_azure.terminating', parsed))
-            env[:azure_arm_service].resources.resource_groups.delete(parsed[:group]).value!.body
+            env[:ui].info('Deleting resource group')
+
+            # Call the begin_xxx_async version to kick off the delete, but don't wait for the resource group to be cleaned up
+            env[:azure_arm_service].resources.resource_groups.begin_delete_async(parsed[:group]).value!
+            env[:ui].info('Resource group is deleting... Moving on.')
           rescue MsRestAzure::AzureOperationError => ex
             unless ex.response.status == 404
               raise ex

data/lib/vagrant-azure/capabilities/winrm.rb

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module Azure
+    module Cap
+      class WinRM
+        def self.winrm_info(machine)
+          env = machine.action('read_winrm_info')
+          env[:machine_winrm_info]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/config.rb

@@ -93,6 +93,26 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :endpoint
 
+      # (Optional - requrired for Windows) The admin username for Windows templates -- ENV['AZURE_VM_ADMIN_USERNAME']
+      #
+      # @return [String]
+      attr_accessor :admin_username
+
+      # (Optional - Required for Windows) The admin username for Windows templates -- ENV['AZURE_VM_ADMIN_PASSWORD']
+      #
+      # @return [String]
+      attr_accessor :admin_password
+
+      # (Optional) Whether to automatically install a self-signed cert and open the firewall port for winrm over https -- default true
+      #
+      # @return [Bool]
+      attr_accessor :winrm_install_self_signed_cert
+
+      # (Optional - Required for Windows) The admin username for Windows templates -- ENV['AZURE_VM_ADMIN_PASSWORD']
+      #
+      # @return [String]
+      attr_accessor :deployment_template
+
       def initialize
         @tenant_id = UNSET_VALUE
         @client_id = UNSET_VALUE
@@ -111,6 +131,10 @@ module VagrantPlugins
         @availability_set_name = UNSET_VALUE
         @instance_ready_timeout = UNSET_VALUE
         @instance_check_interval = UNSET_VALUE
+        @admin_username = UNSET_VALUE
+        @admin_password = UNSET_VALUE
+        @winrm_install_self_signed_cert = UNSET_VALUE
+        @deployment_template = UNSET_VALUE
       end
 
       def finalize!
@@ -123,16 +147,21 @@ module VagrantPlugins
         @vm_name = Haikunator.haikunate(100) if @vm_name == UNSET_VALUE
         @resource_group_name = Haikunator.haikunate(100) if @resource_group_name == UNSET_VALUE
         @vm_password = nil if @vm_password == UNSET_VALUE
-        @vm_image_urn = 'canonical:ubuntuserver:16.04.0-DAILY-LTS:latest' if @vm_image_urn == UNSET_VALUE
+        @vm_image_urn = 'canonical:ubuntuserver:16.04.0-LTS:latest' if @vm_image_urn == UNSET_VALUE
         @location = 'westus' if @location == UNSET_VALUE
         @virtual_network_name = nil if @virtual_network_name == UNSET_VALUE
         @subnet_name = nil if @subnet_name == UNSET_VALUE
         @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
-        @vm_size = 'Standard_D1' if @vm_size == UNSET_VALUE
+        @vm_size = 'Standard_DS2_v2' if @vm_size == UNSET_VALUE
         @availability_set_name = nil if @availability_set_name == UNSET_VALUE
 
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
         @instance_check_interval = 2 if @instance_check_interval == UNSET_VALUE
+
+        @admin_username = (ENV['AZURE_VM_ADMIN_USERNAME'] || 'vagrant') if @admin_username == UNSET_VALUE
+        @admin_password = (ENV['AZURE_VM_ADMIN_PASSWORD'] || '$Vagrant(0)') if @admin_password == UNSET_VALUE
+        @winrm_install_self_signed_cert = true if @winrm_install_self_signed_cert == UNSET_VALUE
+        @deployment_template = nil if @deployment_template == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-azure/plugin.rb

@@ -37,6 +37,11 @@ module VagrantPlugins
         Provider
       end
 
+      provider_capability(:azure, :winrm_info) do
+        require_relative 'capabilities/winrm'
+        VagrantPlugins::Azure::Cap::WinRM
+      end
+
       def self.setup_i18n
         I18n.load_path << File.expand_path(
           'locales/en.yml',

data/lib/vagrant-azure/provider.rb

@@ -10,6 +10,14 @@ module VagrantPlugins
 
       def initialize(machine)
         @machine = machine
+
+        # Load the driver
+        machine_id_changed
+
+        # turn off nfs functionality by default, so the machine will fall back to rsync by default
+        @machine.config.nfs.functional = false
+        @machine.config.winrm.password = @machine.provider_config.admin_password
+        @machine.config.winrm.username = @machine.provider_config.admin_username
       end
 
       def action(name)
@@ -29,6 +37,11 @@ module VagrantPlugins
         env[:machine_ssh_info]
       end
 
+      def winrm_info
+        env = @machine.action('read_winrm_info')
+        env[:machine_winrm_info]
+      end
+
       def state
         # Run a custom action we define called "read_state" which does what it
         # says. It puts the state in the `:machine_state_id` key in the env

data/lib/vagrant-azure/util/vm_await.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
             end
 
             count += 1
-            vm = azure.compute.virtual_machines.get(parsed[:group], parsed[:name], 'instanceView').value!.body
+            vm = azure.compute.virtual_machines.get(parsed[:group], parsed[:name], 'instanceView')
             if yield(vm)
               task.shutdown
               true

data/lib/vagrant-azure/version.rb

@@ -4,6 +4,6 @@
 
 module VagrantPlugins
   module Azure
-    VERSION = '2.0.0.pre1'
+    VERSION = '2.0.0.pre2'.freeze
   end
 end

data/locales/en.yml

@@ -92,6 +92,8 @@ en:
         you can run `vagrant destroy`.
     waiting_for_ssh: |-
       Waiting for SSH to become available...
+    waiting_for_winrm: |-
+      Waiting for WinRM to become available...
     ready: |-
       Machine is booted and ready for use!
     public_key_path_private_key: |-

data/templates/arm/deployment.json.erb

@@ -11,18 +11,19 @@
     },
     <% if operating_system == 'Windows' %>
     "adminPassword": {
-      "type": "string",
+      "type": "securestring",
       "metadata": {
         "description": "Password for the Virtual Machine (only used on Windows)"
       }
     },
-    <% end %>
+    <% else %>
     "sshKeyData": {
       "type": "string",
       "metadata": {
         "description": "SSH rsa public key file as a string."
       }
     },
+    <% end %>
     "dnsLabelPrefix": {
       "type": "string",
       "metadata": {
@@ -31,7 +32,7 @@
     },
     "vmSize": {
       "type": "string",
-      "defaultValue": "Standard_D1",
+      "defaultValue": "Standard_DS2_v2",
       "metadata": {
         "description": "Size of the VM"
       }
@@ -58,7 +59,7 @@
     },
     "imageSku": {
       "type": "string",
-      "defaultValue": "16.04.0-DAILY-LTS",
+      "defaultValue": "16.04-LTS",
       "metadata": {
         "description": "Name of the image sku"
       }
@@ -83,24 +84,33 @@
       "metadata": {
         "description": "Name of the virtual network"
       }
+    },
+    "winRmPort": {
+      "type": "int",
+      "defaultValue": 5986,
+      "metadata": {
+        "description": "WinRM port"
+      }
     }
   },
   "variables": {
     "storageAccountName": "[concat(uniquestring(resourceGroup().id), 'vagrant')]",
     "location": "[resourceGroup().location]",
-    "osDiskName": "osDisk1",
+    "osDiskName": "[concat(parameters('vmName'), 'OSDisk1')]",
     "addressPrefix": "10.0.0.0/16",
     "subnetPrefix": "10.0.0.0/24",
     "vmStorageAccountContainerName": "vagrant-vhds",
     "nicName": "[concat(parameters('vmName'), '-vagrantNIC')]",
     "publicIPAddressName": "[concat(parameters('vmName'), '-vagrantPublicIP')]",
     "publicIPAddressType": "Dynamic",
-    "storageAccountType": "Standard_LRS",
+    "storageAccountType": "Premium_LRS",
     "networkSecurityGroupName": "[concat(parameters('vmName'), '-vagrantNSG')]",
     "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
     "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]",
     "subnetRef": "[concat(variables('vnetID'),'/subnets/',parameters('subnetName'))]",
-    "apiVersion": "2015-06-15"
+    "apiVersion": "2015-06-15",
+    "singleQuote": "'",
+    "doubleQuote": "\""
   },
   "resources": [
     {
@@ -119,6 +129,36 @@
       "location": "[variables('location')]",
       "properties": {
         "securityRules": [
+          <% if operating_system == 'Windows' %>
+          {
+            "name": "rdp_rule",
+            "properties": {
+              "description": "Enable Inbound RDP",
+              "protocol": "Tcp",
+              "sourcePortRange": "*",
+              "destinationPortRange": "3389",
+              "sourceAddressPrefix": "*",
+              "destinationAddressPrefix": "*",
+              "access": "Allow",
+              "priority": 123,
+              "direction": "Inbound"
+            }
+          },
+          {
+            "name": "winrm_rule",
+            "properties": {
+              "description": "Enable Inbound WinRM",
+              "protocol": "Tcp",
+              "sourcePortRange": "*",
+              "destinationPortRange": "[parameters('winRmPort')]",
+              "sourceAddressPrefix": "*",
+              "destinationAddressPrefix": "*",
+              "access": "Allow",
+              "priority": 124,
+              "direction": "Inbound"
+            }
+          }
+          <% else %>
           {
             "name": "ssh_rule",
             "properties": {
@@ -133,6 +173,7 @@
               "direction": "Inbound"
             }
           }
+          <% end %>
         ]
       }
     },
@@ -210,6 +251,9 @@
         "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
         "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
       ],
+      <% if operating_system == 'Windows' %>
+      <%= self_signed_cert_resource %>
+      <% end %>
       "properties": {
         "hardwareProfile": {
           "vmSize": "[parameters('vmSize')]"
@@ -217,6 +261,9 @@
         "osProfile": {
           "computerName": "[parameters('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
+          <% if operating_system == 'Windows' %>
+          "adminPassword": "[parameters('adminPassword')]"
+          <% else %>
           "linuxConfiguration": {
             "disablePasswordAuthentication": "true",
             "ssh": {
@@ -228,6 +275,7 @@
               ]
             }
           }
+          <% end %>
         },
         "storageProfile": {
           "imageReference": {
@@ -251,12 +299,6 @@
               "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('nicName'))]"
             }
           ]
-        },
-        "diagnosticsProfile": {
-          "bootDiagnostics": {
-            "enabled": "true",
-            "storageUri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net')]"
-          }
         }
       }
     }

data/templates/arm/selfsignedcert.json.erb

@@ -0,0 +1,19 @@
+      "resources": [
+        {
+            "type": "Microsoft.Compute/virtualMachines/extensions",
+            "name": "[concat(parameters('vmName'),'/WinRMCustomScriptExtension')]",
+            "apiVersion": "[variables('apiVersion')]",
+            "location": "[resourceGroup().location]",
+            "dependsOn": [
+                "[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
+            ],
+            "properties": {
+             "publisher": "Microsoft.Compute",
+             "type": "CustomScriptExtension",
+               "typeHandlerVersion": "1.4",
+               "settings": {
+                 "commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -command ', variables('doubleQuote'), '& { <%= setup_winrm_powershell %> }', variables('doubleQuote'))]"
+               }
+           }
+        }
+      ],

data/templates/arm/setup-winrm.ps1.erb

@@ -0,0 +1,7 @@
+$hostname = '<%= dns_label_prefix %>.<%= location %>.cloudapp.azure.com'
+$Cert = (New-SelfSignedCertificate -CertstoreLocation Cert:/LocalMachine/My -DnsName $hostname).Thumbprint
+$transport = New-Item -Path WSMan:/LocalHost/Listener -Transport HTTPS -Address * -CertificateThumbPrint $Cert -Force
+cd $transport.PSPath
+set-item  ./HostName -value $hostname -force
+set-item  ./Port -value <%= winrm_port %> -force
+netsh advfirewall firewall add rule name=WinRM_HTTPS dir=in action=allow protocol=TCP localport=<%= winrm_port %>

data/vagrant-azure.gemspec

@@ -8,6 +8,7 @@ require 'vagrant-azure/version'
 Gem::Specification.new do |s|
   s.name          = 'vagrant-azure'
   s.version       = VagrantPlugins::Azure::VERSION
+  s.platform      = Gem::Platform::RUBY
   s.authors       = %w(Azure)
   s.description   = 'Enable Vagrant to manage machines in Microsoft Azure.'
   s.summary       = 'Enable Vagrant to manage Windows and Linux machines in Microsoft Azure.'
@@ -18,15 +19,16 @@ Gem::Specification.new do |s|
   s.bindir        = 'bin'
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
-  s.add_runtime_dependency 'azure_mgmt_resources',  '~>0.2.1'
-  s.add_runtime_dependency 'azure_mgmt_compute',    '~>0.2.1'
-  s.add_runtime_dependency 'azure_mgmt_network',    '~>0.2.1'
-  s.add_runtime_dependency 'azure_mgmt_storage',    '~>0.2.1'
+  s.add_runtime_dependency 'azure_mgmt_resources',  '~>0.8.0'
+  s.add_runtime_dependency 'azure_mgmt_compute',    '~>0.8.0'
+  s.add_runtime_dependency 'azure_mgmt_network',    '~>0.8.0'
+  s.add_runtime_dependency 'azure_mgmt_storage',    '~>0.8.0'
   s.add_runtime_dependency 'haikunator',            '~>1.1'
+  s.add_runtime_dependency 'highline',              '~>1.7'
 
   s.add_development_dependency 'bundler',           '~>1.9'
   s.add_development_dependency 'rake',              '~>11.1'
   s.add_development_dependency 'rspec',             '~>3.4'
-  s.add_development_dependency 'simplecov',         '~>0.11.2'
+  s.add_development_dependency 'simplecov',         '~>0.11'
   s.add_development_dependency 'coveralls',         '~>0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Azure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: haikunator
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -177,12 +191,14 @@ files:
 - lib/vagrant-azure/action/message_will_not_destroy.rb
 - lib/vagrant-azure/action/read_ssh_info.rb
 - lib/vagrant-azure/action/read_state.rb
+- lib/vagrant-azure/action/read_winrm_info.rb
 - lib/vagrant-azure/action/restart_vm.rb
 - lib/vagrant-azure/action/run_instance.rb
 - lib/vagrant-azure/action/start_instance.rb
 - lib/vagrant-azure/action/stop_instance.rb
 - lib/vagrant-azure/action/terminate_instance.rb
 - lib/vagrant-azure/action/wait_for_state.rb
+- lib/vagrant-azure/capabilities/winrm.rb
 - lib/vagrant-azure/config.rb
 - lib/vagrant-azure/errors.rb
 - lib/vagrant-azure/plugin.rb
@@ -198,6 +214,8 @@ files:
 - spec/vagrant-azure/config_spec.rb
 - spec/vagrant-azure/services/azure_resource_manager_spec.rb
 - templates/arm/deployment.json.erb
+- templates/arm/selfsignedcert.json.erb
+- templates/arm/setup-winrm.ps1.erb
 - templates/provisioners/chef-solo/solo.erb
 - vagrant-azure.gemspec
 homepage: https://github.com/azure/vagrant-azure
@@ -220,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Enable Vagrant to manage Windows and Linux machines in Microsoft Azure.