vagrant-azure 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bec96dd4b99f7a5bf92f5d5b8056b1ce4885d44
-  data.tar.gz: aa65b0f1615ae25b591ffd59efd462332ea4de93
+  metadata.gz: 500531015ee4b9fa81557c8398f1fed55455cc4c
+  data.tar.gz: dec5502ea4dab238bb49cd61b2559102ad4eada6
 SHA512:
-  metadata.gz: 5f838e34d66d8795e0b0dc00ad4f2529ad230f996e06923ba37adb4e1d16403c263dfca156d292ccc204c5e63ec39fe63491474f8164e8e0efbfc515a90457e2
-  data.tar.gz: 3e057b8906ad18b76e15dcf5f8a674bbaa3b050880de1e5e4a188a1efa07c0d811fee2b4e2c855764862bf1b2a8fc151372d4d6709ce252f1eb7f01ac1defe21
+  metadata.gz: 2dce397adb9a233f7294d3f857e7de47c192b76a4da0f959e826a0ca449015bba6984d655d6a23d19d4d7a83e027f92facf35ba55cf084855d91dfe8f82c509b
+  data.tar.gz: 18d6a73dd73b31e4cafa27b29aaffcfb626653d6f6e36a7aab6a49853658872faadc6ae94b87c26456280b40b5dbe838ce973426eac029c3fd98cc9569902329

data/README.md

@@ -11,10 +11,10 @@ provider to Vagrant, allowing Vagrant to control and provision machines in Micro
 
 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:
 
-```
-vagrant plugin install vagrant-azure --plugin-version '2.0.0.pre1' --plugin-prerelease
+```sh
+& vagrant plugin install vagrant-azure --plugin-version '2.0.0.pre3'
 ...
-vagrant up --provider=azure
+$ vagrant up --provider=azure
 ...
 ```
 
@@ -24,12 +24,12 @@ 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:
 
-```
-vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box
+```sh
+$ vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box
 ...
 ```
 
-Now edit your ```Vagrantfile``` as shown below and provide all the values as explained.
+For ***nix**, edit your `Vagrantfile` as shown below and provide all the values as explained.
 
 ```ruby
 Vagrant.configure('2') do |config|
@@ -52,10 +52,41 @@ Vagrant.configure('2') do |config|
 end
 ```
 
-Now you can run
+For **Windows**, edit your `Vagrantfile` as shown below and provide all the values as explained.
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.vm.box = 'azure'
 
+  config.vm.provider :azure do |azure, override|
+
+    # use Azure Active Directory Application / Service Principal to connect to Azure
+    # see: https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/
+
+    # each of the below values will default to use the env vars named as below if not specified explicitly
+    azure.tenant_id = ENV['AZURE_TENANT_ID']
+    azure.client_id = ENV['AZURE_CLIENT_ID']
+    azure.client_secret = ENV['AZURE_CLIENT_SECRET']
+    azure.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+
+    azure.vm_image_urn = 'MicrosoftSQLServer:SQL2016-WS2012R2:Express:latest'
+    azure.instance_ready_timeout = 600
+    azure.vm_password = 'TopSecretPassw0rd'
+    azure.admin_username = "OctoAdmin"
+    azure.admin_password = 'TopSecretPassw0rd'
+    override.winrm.transport = :ssl
+    override.winrm.port = 5986
+    override.winrm.ssl_peer_verification = false # must be false if using a self signed cert
+  end
+
+end
 ```
-vagrant up --provider=azure
+
+Now you can run
+
+```sh
+$ vagrant up --provider=azure
+...
 ```
 
 This will bring up an Azure VM as per the configuration options set above.
@@ -66,7 +97,7 @@ Normally, a lot of this options, e.g., ```vm_image_urn```, will be embedded in a
 
 ## Azure Boxes
 
-The vagrant-azure plugin provides the ability to use ```Azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/azure/vagrant-azure/tree/v2.0/example_box) and follow the instructions there to build an ```azure``` box.
+The vagrant-azure plugin provides the ability to use ```Azure``` boxes with Vagrant. Please see the example box provided in [example_box](https://github.com/azure/vagrant-azure/tree/v2.0/example_box) directory and follow the instructions there to build an ```azure``` box.
 
 Please see [Vagrant Docs](http://docs.vagrantup.com/v2/) for more details.
 
@@ -76,21 +107,28 @@ The vagrant-azure provide exposes a few Azure specific configuration options:
 
 ### Mandatory
 
-For instructions on how to setup an Azure Active Directory Application see: https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/
+For instructions on how to setup an Azure Active Directory Application see: <https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/>
+
 * `tenant_id`: Your Azure Active Directory Tenant Id.
 * `client_id`: Your Azure Active Directory application client id.
 * `client_secret`: Your Azure Active Directory application client secret.
 * `subscription_id`: The Azure subscription Id you'd like to use.
 
 ### Optional
+
 * `resource_group_name`: (Optional) Name of the resource group to use.
-* `location`: (Optional) Azure location to build the VM -- defaults to 'westus'
+* `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_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/
+* `vm_size`: (Optional) VM size to be used -- defaults to 'Standard_DS2_v2'. See sizes for [*nix](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-sizes/), [Windows](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-sizes/).
+* `vm_image_urn`: (Optional) Name of the virtual machine image urn to use -- defaults to 'canonical:ubuntuserver:16.04-LTS:latest'. See documentation for [*nix](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/), [Windows](https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-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.
 * `instance_check_interval`: (Optional) The interval to wait for checking an instance's state -- default 2 seconds.
-* `endpoint`: (Optional) The Azure Management API endpoint -- default 'https://management.azure.com' seconds -- ENV['AZURE_MANAGEMENT_ENDPOINT'].
+* `endpoint`: (Optional) The Azure Management API endpoint -- default `ENV['AZURE_MANAGEMENT_ENDPOINT']` if exists, falls back to <https://management.azure.com>.
+* `admin_username`: (Optional) The root/administrator username for the VM
+* `admin_password`: (Optional, Windows only) The password to set for the windows administrator user
+* `winrm_install_self_signed_cert`: (Optional, Windows only) Whether to install a self-signed cert automatically to enable WinRM to communicate over HTTPS (5986). Only available when a custom `deployment_template` is not supplied. Default 'true'.
+* `deployment_template`: (Optional) A custom ARM template to use instead of the default template
+* `wait_for_destroy`: (Optional) Wait for all resources to be deleted prior to completing Vagrant destroy -- default false.

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

@@ -90,6 +90,7 @@ module VagrantPlugins
           operating_system = get_image_os(image_details)
 
           template_params = {
+            availability_set_name:          availability_set_name,
             operating_system:               operating_system,
             winrm_install_self_signed_cert: winrm_install_self_signed_cert,
             winrm_port:                     winrm_port,

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

@@ -10,7 +10,7 @@ module VagrantPlugins
       class TerminateInstance
         include VagrantPlugins::Azure::Util::MachineIdHelper
 
-        def initialize(app, env)
+        def initialize(app, _)
           @app = app
           @logger = Log4r::Logger.new('vagrant_azure::action::terminate_instance')
         end
@@ -23,7 +23,12 @@ module VagrantPlugins
             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!
+            if env[:machine].provider_config.wait_for_destroy
+              env[:azure_arm_service].resources.resource_groups.delete(parsed[:group])
+            else
+              env[:azure_arm_service].resources.resource_groups.begin_delete_async(parsed[:group]).value!
+            end
+
             env[:ui].info('Resource group is deleting... Moving on.')
           rescue MsRestAzure::AzureOperationError => ex
             unless ex.response.status == 404

data/lib/vagrant-azure/config.rb

@@ -113,6 +113,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :deployment_template
 
+      # (Optional) Wait for all resources to be deleted prior to completing Vagrant destroy -- default false.
+      #
+      # @return [String]
+      attr_accessor :wait_for_destroy
+
       def initialize
         @tenant_id = UNSET_VALUE
         @client_id = UNSET_VALUE
@@ -135,6 +140,7 @@ module VagrantPlugins
         @admin_password = UNSET_VALUE
         @winrm_install_self_signed_cert = UNSET_VALUE
         @deployment_template = UNSET_VALUE
+        @wait_for_destroy = UNSET_VALUE
       end
 
       def finalize!
@@ -162,6 +168,7 @@ module VagrantPlugins
         @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
+        @wait_for_destroy = false if @wait_for_destroy == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-azure/version.rb

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

data/spec/spec_helper.rb

@@ -3,35 +3,6 @@
 # Licensed under the MIT License. See License in the project root for license information.
 require 'vagrant-azure'
 
-if ENV['COVERAGE'] || ENV['CI'] || ENV['TRAVIS']
-  require 'simplecov'
-  require 'coveralls'
-
-  if ENV['TRAVIS']
-    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-        SimpleCov::Formatter::HTMLFormatter,
-        Coveralls::SimpleCov::Formatter
-    ]
-  else
-    SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-  end
-
-  SimpleCov.start do
-    project_name 'vagrant-azure'
-    add_filter '/build-tests/'
-    add_filter '/coverage/'
-    add_filter '/locales/'
-    add_filter '/templates/'
-    add_filter '/doc/'
-    add_filter '/example_box/'
-    add_filter '/pkg/'
-    add_filter '/spec/'
-    add_filter '/tasks/'
-    add_filter '/yard-template/'
-    add_filter '/yardoc/'
-  end
-end
-
 # import all the support files
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require File.expand_path(f) }
 

data/templates/arm/deployment.json.erb

@@ -242,6 +242,14 @@
         ]
       }
     },
+    <% if availabilitySetName = availability_set_name.nil? || availability_set_name.empty? ? nil : availability_set_name %>
+    {
+      "apiVersion": "[variables('apiVersion')]",
+      "type": "Microsoft.Compute/availabilitySets",
+      "name": "<%= availabilitySetName %>",
+      "location": "[variables('location')]"
+    },
+    <% end %>
     {
       "apiVersion": "[variables('apiVersion')]",
       "type": "Microsoft.Compute/virtualMachines",
@@ -250,6 +258,9 @@
       "dependsOn": [
         "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
         "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+        <% if availabilitySetName %>,
+        "[resourceId('Microsoft.Compute/availabilitySets', '<%= availabilitySetName %>')]"
+        <% end %>
       ],
       <% if operating_system == 'Windows' %>
       <%= self_signed_cert_resource %>
@@ -300,6 +311,11 @@
             }
           ]
         }
+        <% if availabilitySetName %>,
+        "availabilitySet": {
+          "id": "[resourceId('Microsoft.Compute/availabilitySets', '<%= availabilitySetName %>')]"
+        }
+        <% end %>
       }
     }
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Azure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources