kitchen-azurerm 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8faa0eea59a7410da85cbdac7f77786361b84f49
-  data.tar.gz: 58cff5b62510c6aacc03a885ec2cfeaf3802f88f
+  metadata.gz: 2bdc1fdf5f92aa6e66d2e70dea9b8ec191f82f33
+  data.tar.gz: 8459a815ab0a4bf77e806841c09821ac35e52eaa
 SHA512:
-  metadata.gz: be224e4ad2628d374df1d2c752a58f24e8b0583cfb65517917a323e39e4472455547127f71e2703a28680ac0f17b1a37709e4e8f38140b44c63287b775ddcbe0
-  data.tar.gz: 127bf050a655c568739a96662a09df699355448052f60577ae8bd26357fd4f1a49f202896f6e753093843ac73a808c6198814421a51865f61237c4e88177c0b7
+  metadata.gz: 0fce37482ad1c3a879257c58b0e1f14501f4365913d793cddc01c74a1858d0c259d302caa4c5a41b641573124c8ea0a2b9b350bc8820f992e6cc5f38a33a95b1
+  data.tar.gz: 0a0617b0908c820a7d961788a87df5b1f5bf96fdd6d9c49b0b62bc0edb97fc5b18e4ac4612fbe4916181dc1fac09fe74e67d56b8eecd7aa64336edb54d9a98b2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # kitchen-azurerm Changelog
 
+## [0.12.0] - 2017-09-01
+- Additional managed disks can be specified in configuration and left unformatted or formatted on Windows(@stuartpreston)
+- Added `azure_resource_group_prefix` and `azure_resource_group_suffix` parameter (@stuartpreston)
+
 ## [0.11.0] - 2017-07-20
 - Pin to latest ARM SDK and constants [#59](https://github.com/test-kitchen/kitchen-azurerm/pull/59) (@smurawski)
 

data/README.md

@@ -367,6 +367,45 @@ suites:
     attributes:
 ```
 
+### .kitchen.yml example 8 - Windows 2016 VM with additional data disks:
+
+This example demonstrates how to add 3 additional Managed data disks to a Windows Server 2016 VM. Not supported with legacy (pre-managed disk) storage accounts.
+
+Note the availability of a `format_data_disks` option (default: `false`).  When set to true, a PowerShell script will execute at first boot to initialize and format the disks with an NTFS filesystem.  This option has no effect on Linux machines.
+
+```yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
+  location: 'West Europe'
+  machine_size: 'Standard_F2s'
+
+provisioner:
+  name: chef_zero
+
+platforms:
+- name: windows2016-noformat
+  driver_config:
+    image_urn: MicrosoftWindowsServer:WindowsServer:2016-Datacenter:latest
+    data_disks:
+      - lun: 0
+        disk_size_gb: 128
+      - lun: 1
+        disk_size_gb: 128
+      - lun: 2
+        disk_size_gb: 128
+    # format_data_disks: false
+
+suites:
+  - name: default
+    run_list:
+      - recipe[kitchentesting::default]
+    attributes:
+```
+
 ## Support for Government and Sovereign Clouds (China and Germany)
 
 Starting with v0.9.0 this driver has support for Azure Government and Sovereign Clouds via the use of the ```azure_environment``` setting.  Valid Azure environments are ```Azure```, ```AzureUSGovernment```, ```AzureChina``` and ```AzureGermanCloud```
@@ -451,6 +490,7 @@ info:    vm image list command OK
 - The ```existing_storage_account_blob_url``` can be specified to specify an url to an existing storage account (needed for ```image_url```)
 - The ```custom_data``` parameter can be used to specify custom data to provide to the instance. This can be a file or the data itself. This module handles base64 encoding for you.
 - The ```os_disk_size_gb``` parameter can be used to specify a custom os disk size.
+- The ```azure_resource_group_prefix``` and ```azure_resource_group_suffix``` can be used to further disambiguate Azure resource group names created by the driver.
 
 ## Contributing
 

data/lib/kitchen/driver/azurerm.rb

@@ -18,8 +18,16 @@ module Kitchen
     class Azurerm < Kitchen::Driver::Base
       attr_accessor :resource_management_client
 
+      default_config(:azure_resource_group_prefix) do |_config|
+        'kitchen-'
+      end
+
+      default_config(:azure_resource_group_suffix) do |_config|
+        ''
+      end
+
       default_config(:azure_resource_group_name) do |config|
-        "kitchen-#{config.instance.name}"
+        config.instance.name.to_s
       end
 
       default_config(:image_urn) do |_config|
@@ -110,6 +118,18 @@ module Kitchen
         true
       end
 
+      default_config(:data_disks) do |_config|
+        nil
+      end
+
+      default_config(:format_data_disks) do |_config|
+        false
+      end
+
+      default_config(:format_data_disks_powershell_script) do |_config|
+        false
+      end
+
       def create(state)
         state = validate_state(state)
         deployment_parameters = {
@@ -161,7 +181,7 @@ module Kitchen
 
         credentials = Kitchen::Driver::Credentials.new.azure_credentials_for_subscription(config[:subscription_id], config[:azure_environment])
         management_endpoint = resource_manager_endpoint_url(config[:azure_environment])
-        info "Azure environment: #{config[:azure_environment]}"
+        debug "Azure environment: #{config[:azure_environment]}"
         @resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(credentials, management_endpoint)
         @resource_management_client.subscription_id = config[:subscription_id]
 
@@ -187,6 +207,13 @@ module Kitchen
           deployment_name = "deploy-#{state[:uuid]}"
           info "Creating deployment: #{deployment_name}"
           resource_management_client.deployments.begin_create_or_update_async(state[:azure_resource_group_name], deployment_name, deployment(deployment_parameters)).value!
+          follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
+          if File.file?(config[:pre_deployment_template])
+            pre_deployment_name = "pre-deploy-#{state[:uuid]}"
+            info "Creating deployment: #{pre_deployment_name}"
+            resource_management_client.deployments.begin_create_or_update_async(state[:azure_resource_group_name], pre_deployment_name, pre_deployment(config[:pre_deployment_template], config[:pre_deployment_parameters])).value!
+            follow_deployment_until_end_state(state[:azure_resource_group_name], post_deployment_name)
+          end
         rescue ::MsRestAzure::AzureOperationError => operation_error
           rest_error = operation_error.body['error']
           deployment_active = rest_error['code'] == 'DeploymentActive'
@@ -199,9 +226,6 @@ module Kitchen
           end
         end
 
-        # Monitor all operations until completion
-        follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
-
         network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials, management_endpoint)
         network_management_client.subscription_id = config[:subscription_id]
 
@@ -236,7 +260,22 @@ module Kitchen
 
       def azure_resource_group_name
         formatted_time = Time.now.utc.strftime '%Y%m%dT%H%M%S'
-        "#{config[:azure_resource_group_name]}-#{formatted_time}"
+        "#{config[:azure_resource_group_prefix]}#{config[:azure_resource_group_name]}-#{formatted_time}#{config[:azure_resource_group_suffix]}"
+      end
+
+      def data_disks_for_vm_json
+        return nil if config[:data_disks].nil?
+        disks = []
+
+        if config[:use_managed_disks]
+          config[:data_disks].each do |data_disk|
+            disks << { name: "datadisk#{data_disk[:lun]}", lun: data_disk[:lun], diskSizeGB: data_disk[:disk_size_gb], createOption: 'Empty' }
+          end
+          debug "Additional disks being added to configuration: #{disks.inspect}"
+        else
+          warn 'Data disks are only supported when used with the "use_managed_disks" option. No additional disks were added to the configuration.'
+        end
+        disks.to_json
       end
 
       def template_for_transport_name
@@ -244,7 +283,7 @@ module Kitchen
         if instance.transport.name.casecmp('winrm').zero?
           if instance.platform.name.index('nano').nil?
             info 'Adding WinRM configuration to provisioning profile.'
-            encoded_command = Base64.strict_encode64(enable_winrm_powershell_script)
+            encoded_command = Base64.strict_encode64(custom_data_script_windows)
             template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }.each do |resource|
               resource['properties']['osProfile']['customData'] = encoded_command
               resource['properties']['osProfile']['windowsConfiguration'] = windows_unattend_content
@@ -399,10 +438,46 @@ winrm set winrm/config/service/auth '@{Basic="true";Kerberos="false";Negotiate="
 New-NetFirewallRule -DisplayName "Windows Remote Management (HTTPS-In)" -Name "Windows Remote Management (HTTPS-In)" -Profile Any -LocalPort 5986 -Protocol TCP
 winrm set winrm/config/service '@{AllowUnencrypted="true"}'
 New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Windows Remote Management (HTTP-In)" -Profile Any -LocalPort 5985 -Protocol TCP
-logoff
         PS1
       end
 
+      def format_data_disks_powershell_script
+        return unless config[:format_data_disks]
+        info 'Data disks will be initialized and formatted NTFS automatically.' unless config[:data_disks].nil?
+        config[:format_data_disks_powershell_script] || <<-PS1
+Write-Host "Initializing and formatting raw disks"
+$disks = Get-Disk | where partitionstyle -eq 'raw'
+$letters = New-Object System.Collections.ArrayList
+$letters.AddRange( ('F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z') )
+Function AvailableVolumes() {
+$currentDrives = get-volume
+ForEach ($v in $currentDrives) {
+  if ($letters -contains $v.DriveLetter.ToString()) {
+      Write-Host "Drive letter $($v.DriveLetter) is taken, moving to next letter"
+      $letters.Remove($v.DriveLetter.ToString())
+    }
+  }
+}
+ForEach ($d in $disks) {
+  AvailableVolumes
+  $driveLetter = $letters[0]
+  Write-Host "Creating volume $($driveLetter)"
+  $d | Initialize-Disk -PartitionStyle GPT -PassThru | New-Partition -DriveLetter $driveLetter  -UseMaximumSize
+  # Prevent error ' Cannot perform the requested operation while the drive is read only'
+  Start-Sleep 1
+  Format-Volume -FileSystem NTFS -NewFileSystemLabel "datadisk" -DriveLetter $driveLetter -Confirm:$false
+}
+        PS1
+      end
+
+      def custom_data_script_windows
+        <<-EOH
+#{enable_winrm_powershell_script}
+#{format_data_disks_powershell_script}
+logoff
+        EOH
+      end
+
       def custom_linux_configuration(public_key)
         <<-EOH
         {
@@ -440,10 +515,10 @@ logoff
 
       def virtual_machine_deployment_template
         if config[:vnet_id] == ''
-          virtual_machine_deployment_template_file('public.erb', vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb])
+          virtual_machine_deployment_template_file('public.erb', vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
         else
           info "Using custom vnet: #{config[:vnet_id]}"
-          virtual_machine_deployment_template_file('internal.erb', vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb])
+          virtual_machine_deployment_template_file('internal.erb', vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
         end
       end
 

data/templates/internal.erb

@@ -236,7 +236,7 @@
             }
         },
         {
-            "apiVersion": "2016-04-30-preview",
+            "apiVersion": "2017-03-30",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
@@ -327,6 +327,10 @@
                         <%- end -%>
                     }
                     <%- end -%>
+                    <%- unless data_disks_for_vm_json.nil? -%>
+                      ,"dataDisks": 
+                          <%= data_disks_for_vm_json %>
+                    <%- end -%>
                 }
             },
             "tags": {

data/templates/public.erb

@@ -255,7 +255,7 @@
             }
         },
         {
-            "apiVersion": "2016-04-30-preview",
+            "apiVersion": "2017-03-30",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
@@ -327,6 +327,10 @@
                         "createOption": "FromImage"
                     }
                     <%- end -%>
+                    <%- unless data_disks_for_vm_json.nil? -%>
+                      ,"dataDisks": 
+                          <%= data_disks_for_vm_json %>
+                    <%- end -%>
                 },
                 "networkProfile": {
                     "networkInterfaces": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile