kitchen-azurerm 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9802000d8da44ea5c8a5db26f62bc73032f3de
-  data.tar.gz: 05af13b533563440adf0bf12b4d484bce16ab6d6
+  metadata.gz: b7e6e0ca8bce2a4cf7a5caf2d2cc72e68265ca20
+  data.tar.gz: 2668997b038ca7f8867aede1bbc24026d93fc651
 SHA512:
-  metadata.gz: fa059e1b4db08380723c341a1bfba8eed3b286c2d1da15859dc4c65d6e805acebfd632909f00be3b5678c2866a3e4c8c60b9fff4c69ce64ab0579301a8eea990
-  data.tar.gz: 405e3b0cf9ff62ad381196a462ba8093fd8043b34b74258881d51b51bfa7bd26ec4d7cf71d734a7df1f071ab6460283d865adac9d8dd74fb217d29ed6ec38dcc
+  metadata.gz: 444bdbc590bff6e80f040328ecb1e7c52e5754ef3d5d6b4a07878a64fdae27a3132df59f71c826f75449f10d77dce826b5dc0dec078a2132eeebaf255834366e
+  data.tar.gz: cc903b216802ebcae4661737e3d3d2e968d6803256eaaa1947b743648500030d6685701f705bb7eb597c32c9a2f35579b75639a80ef124f05d1031474a4ebcbe

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # kitchen-azurerm Changelog
 
+## [0.10.0] - 2017-07-03
+- Support for custom images (@elconas)
+- Support for custom-data (Linux only) (@elconas)
+- Support for custom OS sizes (@elconas)
+
 ## [0.9.1] - 2017-05-25
 - Support for Managed Disks enabled by default (@stuartpreston)
 - Add ```use_managed_disks``` driver_config parameter (@stuartpreston)

data/README.md

@@ -235,6 +235,138 @@ suites:
     attributes:
 ```
 
+### .kitchen.yml example 5 - deploy VM to existing virtual network/subnet (use for ExpressRoute/VPN scenarios) with Private Managed Image
+
+This example is the same as above, but uses a private managed image to provision the vm. 
+
+Note: The image must be available first. On deletion the disk and everything is removed.
+
+```yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
+  location: 'West Europe'
+  machine_size: 'Standard_D1'
+
+transport:
+  ssh_key: ~/.ssh/id_kitchen-azurerm
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: ubuntu-1404
+    driver_config:
+      image_id: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/RESGROUP/providers/Microsoft.Compute/images/IMAGENAME
+      vnet_id: /subscriptions/b6e7eee9-YOUR-GUID-HERE-03ab624df016/resourceGroups/pendrica-infrastructure/providers/Microsoft.Network/virtualNetworks/pendrica-arm-vnet
+      subnet_id: subnet-10.1.0
+      use_managed_disk: true
+      
+
+suites:
+  - name: default
+    run_list:
+      - recipe[kitchen-azurerm-demo::default]
+    attributes:
+```
+
+### .kitchen.yml example 6 - deploy VM to existing virtual network/subnet (use for ExpressRoute/VPN scenarios) with Private Classic OS Image
+
+This example a classic Custom VM Image (aka a VHD file) is used. As the Image VHD must be in the same storage account then the disk of the instance, the os disk is created in an existing image account. 
+
+Note: When the resource group ís deleted, the os disk is left in the extsing storage account blob. You must cleanup manually.
+
+This example will: 
+
+* use the customized image https://yourstorageaccount.blob.core.windows.net/system/Microsoft.Compute/Images/images/Cent7_P4-osDisk.170dd1b7-7dc3-4496-b248-f47c49f63965.vhd (can be built with packer)
+* set the disk url of the vm to https://yourstorageaccount.blob.core.windows.net/vhds/osdisk-kitchen-XXXXX.vhd
+* set the os type to linux
+
+
+```yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
+  location: 'West Europe'
+  machine_size: 'Standard_D1'
+
+transport:
+  ssh_key: ~/.ssh/id_kitchen-azurerm
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: ubuntu-1404
+    driver_config:
+      image_url: https://yourstorageaccount.blob.core.windows.net/system/Microsoft.Compute/Images/images/Cent7_P4-osDisk.170dd1b7-7dc3-4496-b248-f47c49f63965.vhd
+      existing_storage_account_blob_url: https://yourstorageaccount.blob.core.windows.net
+      os_type: linux
+      use_managed_disk: false
+      vnet_id: /subscriptions/b6e7eee9-YOUR-GUID-HERE-03ab624df016/resourceGroups/pendrica-infrastructure/providers/Microsoft.Network/virtualNetworks/pendrica-arm-vnet
+      subnet_id: subnet-10.1.0
+
+suites:
+  - name: default
+    run_list:
+      - recipe[kitchen-azurerm-demo::default]
+    attributes:
+```
+
+### .kitchen.yml example 7 - deploy VM to existing virtual network/subnet (use for ExpressRoute/VPN scenarios) with Private Classic OS Image and providing custom data and extra large os disk
+
+This is the same as above, but uses custom data to customize the instance.
+
+Note: Custom data can be custom data or a file to custom data. Please also note that if you use winrm communication to non-nano windows servers custom data is not supported, as winrm is enabled via custom data.
+
+
+```yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
+  location: 'West Europe'
+  machine_size: 'Standard_D1'
+
+transport:
+  ssh_key: ~/.ssh/id_kitchen-azurerm
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: ubuntu-1404
+    driver_config:
+      image_url: https://yourstorageaccount.blob.core.windows.net/system/Microsoft.Compute/Images/images/Cent7_P4-osDisk.170dd1b7-7dc3-4496-b248-f47c49f63965.vhd
+      existing_storage_account_blob_url: https://yourstorageaccount.blob.core.windows.net
+      os_type: linux
+      use_managed_disk: false
+      vnet_id: /subscriptions/b6e7eee9-YOUR-GUID-HERE-03ab624df016/resourceGroups/pendrica-infrastructure/providers/Microsoft.Network/virtualNetworks/pendrica-arm-vnet
+      subnet_id: subnet-10.1.0
+      os_disk_size_gb: 100
+      #custom_data: /tmp/customdata.txt
+      custom_data: |
+        #cloud-config
+        fqdn: myhostname
+        preserve_hostname: false
+        runcmd:
+          - yum install -y telnet
+
+suites:
+  - name: default
+    run_list:
+      - recipe[kitchen-azurerm-demo::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```
@@ -314,6 +446,11 @@ info:    vm image list command OK
 - The ```enable_boot_diagnostics``` parameter defaults to 'true' and allows you to switch off boot diagnostics in case you are using premium storage.
 - The optional ```vm_tags``` parameter allows you to define key:value pairs to tag VMs with on creation.
 - Managed disks are now enabled by default, to use the Storage account set ```use_managed_disks``` (default: true).
+- The ```image_url``` (unmanaged disks only) parameter can be used to specify a custom vhd (This VHD must be in the same storage account as the disks of the VM, therefore ```existing_storage_account_blob_url``` must also be set and ```use_managed_disks``` must be set to false)
+- The ```image_id``` (managed disks only) parameter can be used to specify an image by id (managed disk). This works only with managed disks.
+- 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.
 
 ## Contributing
 

data/lib/kitchen/driver/azurerm.rb

@@ -7,6 +7,8 @@ require 'base64'
 require 'sshkey'
 require 'fileutils'
 require 'erb'
+require 'ostruct'
+require 'json'
 
 module Kitchen
   module Driver
@@ -24,6 +26,26 @@ module Kitchen
         'Canonical:UbuntuServer:14.04.3-LTS:latest'
       end
 
+      default_config(:image_url) do |_config|
+        ''
+      end
+
+      default_config(:image_id) do |_config|
+        ''
+      end
+
+      default_config(:os_disk_size_gb) do |_config|
+        ''
+      end
+
+      default_config(:os_type) do |_config|
+        'linux'
+      end
+
+      default_config(:custom_data) do |_config|
+        ''
+      end
+
       default_config(:username) do |_config|
         'azure'
       end
@@ -48,6 +70,14 @@ module Kitchen
         'Standard_LRS'
       end
 
+      default_config(:existing_storage_account_blob_url) do |_config|
+        ''
+      end
+
+      default_config(:existing_storage_account_container) do |_config|
+        'vhds'
+      end
+
       default_config(:boot_diagnostics_enabled) do |_config|
         'true'
       end
@@ -82,7 +112,6 @@ module Kitchen
 
       def create(state)
         state = validate_state(state)
-        image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(':', 4)
         deployment_parameters = {
           location: config[:location],
           vmSize: config[:machine_size],
@@ -92,13 +121,44 @@ module Kitchen
           adminUsername: state[:username],
           adminPassword: state[:password] || 'P2ssw0rd',
           dnsNameForPublicIP: "kitchen-#{state[:uuid]}",
-          imagePublisher: image_publisher,
-          imageOffer: image_offer,
-          imageSku: image_sku,
-          imageVersion: image_version,
           vmName: state[:vm_name]
         }
 
+        if config[:custom_data].to_s != ''
+          deployment_parameters['customData'] = prepared_custom_data
+        end
+        # When deploying in a shared storage account, we needs to add
+        # a unique suffix to support multiple kitchen instances
+        if config[:existing_storage_account_blob_url].to_s != ''
+          deployment_parameters['osDiskNameSuffix'] = "-#{state[:azure_resource_group_name]}"
+        end
+        if config[:existing_storage_account_blob_url].to_s != ''
+          deployment_parameters['existingStorageAccountBlobURL'] = config[:existing_storage_account_blob_url]
+        end
+        if config[:existing_storage_account_container].to_s != ''
+          deployment_parameters['existingStorageAccountBlobContainer'] = config[:existing_storage_account_container]
+        end
+        if config[:os_disk_size_gb].to_s != ''
+          deployment_parameters['osDiskSizeGb'] = config[:os_disk_size_gb]
+        end
+
+        # The three deployment modes
+        #  a) Private Image: Managed VM Image (by id)
+        #  b) Private Image: Using a VHD URL (note: we must use existing_storage_account_blob_url due to azure limitations)
+        #  c) Public Image: Using a marketplace image (urn)
+        if config[:image_id].to_s != ''
+          deployment_parameters['imageId'] = config[:image_id]
+        elsif config[:image_url].to_s != ''
+          deployment_parameters['imageUrl'] = config[:image_url]
+          deployment_parameters['osType'] = config[:os_type]
+        else
+          image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(':', 4)
+          deployment_parameters['imagePublisher'] = image_publisher
+          deployment_parameters['imageOffer'] = image_offer
+          deployment_parameters['imageSku'] = image_sku
+          deployment_parameters['imageVersion'] = image_version
+        end
+
         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]}"
@@ -243,7 +303,7 @@ module Kitchen
         deployment.properties.mode = Azure::ARM::Resources::Models::DeploymentMode::Incremental
         deployment.properties.template = JSON.parse(template)
         deployment.properties.parameters = parameters_in_values_format(parameters)
-        debug(deployment.properties.template)
+        debug(JSON.pretty_generate(deployment.properties.template))
         deployment
       end
 
@@ -380,18 +440,17 @@ 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])
+          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])
         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])
+          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])
         end
       end
 
       def virtual_machine_deployment_template_file(template_file, data = {})
         template = File.read(File.expand_path(File.join(__dir__, '../../../templates', template_file)))
-        render_binding = binding
-        data.each { |key, value| render_binding.local_variable_set(key.to_sym, value) }
-        ERB.new(template, nil, '-').result(render_binding)
+        render_binding = OpenStruct.new(data)
+        ERB.new(template, nil, '-').result(render_binding.instance_eval { binding })
       end
 
       def resource_manager_endpoint_url(azure_environment)
@@ -406,6 +465,18 @@ logoff
           MsRestAzure::AzureEnvironments::Azure.resource_manager_endpoint_url
         end
       end
+
+      def prepared_custom_data
+        # If user_data is a file reference, lets read it as such
+        return nil if config[:custom_data].nil?
+        @custom_data ||= begin
+          if File.file?(config[:custom_data])
+            Base64.strict_encode64(File.read(config[:custom_data]))
+          else
+            Base64.strict_encode64(config[:custom_data])
+          end
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/credentials.rb

@@ -47,7 +47,7 @@ module Kitchen
         when 'azurechina'
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
         when 'azuregermancloud'
-          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_germany_settings
+          ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
         when 'azure'
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
         end

data/templates/internal.erb

@@ -38,6 +38,61 @@
                 "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
             }
         },
+        <%- unless os_disk_size_gb.to_s.empty?  -%>
+        "osDiskSizeGb": {
+            "type": "int",
+            "minValue": 1,
+            "maxValue": 1023,
+            "metadata": {
+                "description": "Size of the OS disks in GB."
+            }
+        },
+        <%- end -%>
+        <%- unless custom_data.empty? -%>
+        "customData": {
+            "type": "string",
+            "metadata": {
+                "description": "Custom Data for the instance (e.g. cloud-init or script) - not compatible with winrm."
+            }
+        },
+        <%- end -%>
+        <%- if !existing_storage_account_blob_url.empty? -%>
+        "existingStorageAccountBlobURL": {
+            "type": "string",
+            "metadata": {
+                "description": "The URL of the existing storage account (blob) (without container)"
+            }
+        },
+        <%- end -%>
+        <%- if !existing_storage_account_container.empty? -%>
+        "existingStorageAccountBlobContainer": {
+            "type": "string",
+            "metadata": {
+                "description": "The Container Name for OS Images (blob)"
+            }
+        },
+        <%- end -%>
+        <%- if !image_url.empty? -%>
+        "imageUrl": {
+            "type": "string",
+            "metadata": {
+                "description": "An URL for a private Image (vhd)"
+            }
+        },
+        "osType": {
+            "type": "string",
+            "metadata": {
+                "description": "An OS Type (linux, windows)"
+            }
+        },
+        <%- elsif !image_id.empty? -%>
+        "imageId": {
+            "type": "string",
+            "metadata": {
+                "description": "The id of a managed image"
+            }
+        },
+        <%- else -%>
         "imagePublisher": {
             "type": "string",
             "defaultValue": "Canonical",
@@ -66,6 +121,14 @@
                 "description": "Either a date or latest."
             }
         },
+        <%- end -%>
+        "osDiskNameSuffix": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "A disk Name Suffix to make the disk name unique in existing storage accounts."
+            }
+        },
         "vmName": {
             "type": "string",
             "defaultValue": "vm",
@@ -108,6 +171,7 @@
     },
     "resources": [
         <%- unless use_managed_disks -%>
+        <%- if existing_storage_account_blob_url.empty? -%>
         {
             "type": "Microsoft.Storage/storageAccounts",
             "name": "[parameters('newStorageAccountName')]",
@@ -121,6 +185,7 @@
             }
         },
         <%- end -%>
+        <%- end -%>
         <%- if public_ip -%>
         {
             "apiVersion": "2015-05-01-preview",
@@ -177,8 +242,10 @@
             "location": "[variables('location')]",
             "dependsOn": [ 
                 <%- unless use_managed_disks -%>
+                <%- if existing_storage_account_blob_url.empty? -%>
                 "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
                 <%- end -%>
+                <%- end -%>
                 "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
             ],
             "properties": {
@@ -187,29 +254,57 @@
                 },
                 "osProfile": {
                     "computername": "[variables('vmName')]",
+                    <%- unless custom_data.empty? -%>
+                    "customData": "[parameters('customData')]",
+                    <%- end -%>
                     "adminUsername": "[parameters('adminUsername')]",
                     "adminPassword": "[parameters('adminPassword')]"
                 },
                 "storageProfile": {
+                    <%- if image_url.empty? and image_id.empty? -%>
                     "imageReference": {
                         "publisher": "[parameters('imagePublisher')]",
                         "offer": "[parameters('imageOffer')]",
                         "sku": "[parameters('imageSku')]",
                         "version": "[parameters('imageVersion')]"
                     },
-                    <%- unless use_managed_disks -%>
+                    <%- elsif !image_id.empty? -%>
+                    "imageReference": {
+                        "id": "[parameters('imageId')]"
+                    },
+                    <%- end -%>
+                    <%- if use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),'.vhd')]"
-                        },
-                        "caching": "ReadWrite",
+                        <%- unless os_disk_size_gb.to_s.empty? -%>
+                        "diskSizeGB": "[parameters('osDiskSizeGB')]",
+                        <%- end -%>
                         "createOption": "FromImage"
                     }
-                    <%- end -%>
-                    <%- if use_managed_disks -%>
+                    <%- else -%>
                     "osDisk": {
                         "name": "osdisk",
+                        <%- unless os_disk_size_gb.to_s.empty? -%>
+                        "diskSizeGB": "[parameters('osDiskSizeGB')]",
+                        <%- end -%>
+                        <%- if !image_url.empty? -%>
+                        "image": {
+                            "uri": "[parameters('imageUrl')]"
+                        },
+                        "osType": "[parameters('osType')]",
+                        <%- end -%>
+                        "vhd": {
+                            <%- if existing_storage_account_blob_url.empty? -%>
+                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- else -%>
+                            <%- if existing_storage_account_container.empty? -%>
+                            "uri": "[concat(parameters('existingStorageAccountBlobURL'), '/', variables('vmStorageAccountContainerName'), '/', variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- else -%>
+                            "uri": "[concat(parameters('existingStorageAccountBlobURL'), '/', parameters('existingStorageAccountBlobContainer'), '/', variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- end -%>
+                            <%- end -%>
+                        },
+                        "caching": "ReadWrite",
                         "createOption": "FromImage"
                     }
                     <%- end -%>
@@ -225,7 +320,11 @@
                     <%- unless use_managed_disks -%>
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
+                        <%- if existing_storage_account_blob_url.empty? -%>
                         "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
+                        <%- else -%>
+                        "storageUri": "[parameters('existingStorageAccountBlobURL')]"
+                        <%- end -%>
                     }
                     <%- end -%>
                 }
@@ -236,4 +335,4 @@
             }
         }
     ]
-}
+}

data/templates/public.erb

@@ -38,6 +38,61 @@
                 "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
             }
         },
+        <%- unless os_disk_size_gb.to_s.empty?  -%>
+        "osDiskSizeGb": {
+            "type": "int",
+            "minValue": 1,
+            "maxValue": 1023,
+            "metadata": {
+                "description": "Size of the OS disks in GB."
+            }
+        },
+        <%- end -%>
+        <%- unless custom_data.empty? -%>
+        "customData": {
+            "type": "string",
+            "metadata": {
+                "description": "Custom Data for the instance (e.g. cloud-init or script) - not compatible with winrm."
+            }
+        },
+        <%- end -%>
+        <%- if !existing_storage_account_blob_url.empty? -%>
+        "existingStorageAccountBlobURL": {
+            "type": "string",
+            "metadata": {
+                "description": "The URL of the existing storage account (blob) (without container)"
+            }
+        },
+        <%- end -%>
+        <%- if !existing_storage_account_container.empty? -%>
+        "existingStorageAccountBlobContainer": {
+            "type": "string",
+            "metadata": {
+                "description": "The Container Name for OS Images (blob)"
+            }
+        },
+        <%- end -%>
+        <%- if !image_url.empty? -%>
+        "imageUrl": {
+            "type": "string",
+            "metadata": {
+                "description": "An URL for a private Image (vhd)"
+            }
+        },
+        "osType": {
+            "type": "string",
+            "metadata": {
+                "description": "An OS Type (linux, windows)"
+            }
+        },
+        <%- elsif !image_id.empty? -%>
+        "imageId": {
+            "type": "string",
+            "metadata": {
+                "description": "The id of a managed image"
+            }
+        },
+        <%- else -%>
         "imagePublisher": {
             "type": "string",
             "defaultValue": "Canonical",
@@ -66,6 +121,14 @@
                 "description": "Either a date or latest."
             }
         },
+        <%- end -%>
+        "osDiskNameSuffix": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "A disk Name Suffix to make the disk name unique in existing storage accounts."
+            }
+        },
         "vmName": {
             "type": "string",
             "defaultValue": "vm",
@@ -82,7 +145,7 @@
         },
         "bootDiagnosticsEnabled": {
             "type": "string",
-            "defaultValue": "false",
+            "defaultValue": "true",
             "metadata": {
                 "description": "Whether to enable (true) or disable (false) boot diagnostics. Default: false."
             }
@@ -108,6 +171,7 @@
     },
     "resources": [
         <%- unless use_managed_disks -%>
+        <%- if existing_storage_account_blob_url.empty? -%>
         {
             "type": "Microsoft.Storage/storageAccounts",
             "name": "[parameters('newStorageAccountName')]",
@@ -121,6 +185,7 @@
             }
         },
         <%- end -%>
+        <%- end -%>
         {
             "apiVersion": "2015-05-01-preview",
             "type": "Microsoft.Network/publicIPAddresses",
@@ -196,8 +261,10 @@
             "location": "[variables('location')]",
             "dependsOn": [
                 <%- unless use_managed_disks -%>
+                <%- if existing_storage_account_blob_url.empty? -%>
                 "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
                 <%- end -%>
+                <%- end -%>
                 "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
             ],
             "properties": {
@@ -206,29 +273,57 @@
                 },
                 "osProfile": {
                     "computername": "[variables('vmName')]",
+                    <%- unless custom_data.empty? -%>
+                    "customData": "[parameters('customData')]",
+                    <%- end -%>
                     "adminUsername": "[parameters('adminUsername')]",
                     "adminPassword": "[parameters('adminPassword')]"
                 },
                 "storageProfile": {
+                    <%- if image_url.empty? and image_id.empty? -%>
                     "imageReference": {
                         "publisher": "[parameters('imagePublisher')]",
                         "offer": "[parameters('imageOffer')]",
                         "sku": "[parameters('imageSku')]",
                         "version": "[parameters('imageVersion')]"
                     },
-                    <%- unless use_managed_disks -%>
+                    <%- elsif !image_id.empty? -%>
+                    "imageReference": {
+                        "id": "[parameters('imageId')]"
+                    },
+                    <%- end -%>
+                    <%- if use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),'.vhd')]"
-                        },
-                        "caching": "ReadWrite",
+                        <%- unless os_disk_size_gb.to_s.empty? -%>
+                        "diskSizeGB": "[parameters('osDiskSizeGB')]",
+                        <%- end -%>
                         "createOption": "FromImage"
                     }
-                    <%- end -%>
-                    <%- if use_managed_disks -%>
+                    <%- else -%>
                     "osDisk": {
                         "name": "osdisk",
+                        <%- if !image_url.empty? -%>
+                        <%- unless os_disk_size_gb.to_s.empty? -%>
+                        "diskSizeGB": "[parameters('osDiskSizeGB')]",
+                        <%- end -%>
+                        "image": {
+                            "uri": "[parameters('imageUrl')]"
+                        },
+                        "osType": "[parameters('osType')]",
+                        <%- end -%>
+                        "vhd": {
+                            <%- if existing_storage_account_blob_url.empty? -%>
+                            "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'), '/',variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- else -%>
+                            <%- if existing_storage_account_container.empty? -%>
+                            "uri": "[concat(parameters('existingStorageAccountBlobURL'), '/', variables('vmStorageAccountContainerName'), '/', variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- else -%>
+                            "uri": "[concat(parameters('existingStorageAccountBlobURL'), '/', parameters('existingStorageAccountBlobContainer'), '/', variables('OSDiskName'),parameters('osDiskNameSuffix'),'.vhd')]"
+                            <%- end -%>
+                            <%- end -%>
+                        },
+                        "caching": "ReadWrite",
                         "createOption": "FromImage"
                     }
                     <%- end -%>
@@ -244,7 +339,11 @@
                     <%- unless use_managed_disks -%>
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
+                        <%- if existing_storage_account_blob_url.empty? -%>
                         "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
+                        <%- else -%>
+                        "storageUri": "[parameters('existingStorageAccountBlobURL')]"
+                        <%- end -%>
                     }
                     <%- end -%>
                 }
@@ -255,4 +354,4 @@
             }
         }
     ]
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.