kitchen-azurerm 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ef22eeb440f66a0bffd98b1176b0016fd3d05e
-  data.tar.gz: a891f93f0ea8296aace68d6efdbb111aafcc0400
+  metadata.gz: ad9802000d8da44ea5c8a5db26f62bc73032f3de
+  data.tar.gz: 05af13b533563440adf0bf12b4d484bce16ab6d6
 SHA512:
-  metadata.gz: 19892e32f4c756c90ddd3b7fe9e5dc00cf9ec8e5b722b73ec98006cab9402537a95fd93b8ab868f6ef2d0bcce704dced603e8226b63d6e53e74ef52d64967e88
-  data.tar.gz: 018ce70d5e518dae8759b0a6e5ff6a5daeb77f2d66712e0dca3a0c234b8bd76dfd8f04035ab10a6e707edfa7985ec26fbcc4d4d60d9bb840e863708d07cb0c27
+  metadata.gz: fa059e1b4db08380723c341a1bfba8eed3b286c2d1da15859dc4c65d6e805acebfd632909f00be3b5678c2866a3e4c8c60b9fff4c69ce64ab0579301a8eea990
+  data.tar.gz: 405e3b0cf9ff62ad381196a462ba8093fd8043b34b74258881d51b51bfa7bd26ec4d7cf71d734a7df1f071ab6460283d865adac9d8dd74fb217d29ed6ec38dcc

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # kitchen-azurerm Changelog
 
+## [0.9.1] - 2017-05-25
+- Support for Managed Disks enabled by default (@stuartpreston)
+- Add ```use_managed_disks``` driver_config parameter (@stuartpreston)
+
+## [0.9.0] - 2017-04-28
+- Support for AzureUSGovernment, AzureChina and AzureGermanCloud environments
+- Add ```azure_environment``` driver_config parameter (@stuartpreston)
+
 ## [0.8.1] - 2017-02-28
 - Adding provider identifier tag to all created resources (@stuartpreston)
 

data/README.md

@@ -7,7 +7,9 @@
 This version has been tested on Windows, OS/X and Ubuntu. If you encounter a problem on your platform, please raise an issue.
 
 ## Quick-start
+
 ### Installation
+
 This plugin is distributed as a [Ruby Gem](https://rubygems.org/gems/kitchen-azurerm). To install it, run:
 
 ```$ gem install kitchen-azurerm```
@@ -91,9 +93,7 @@ Where <n> is the number of threads to create. Note that any failure (e.g. an Azu
 
 ### .kitchen.yml example 2 - Windows
 
-Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2012 R2 instance as well as a Windows Server 2008 R2 instance, using WinRM as the transport. The resource created in Azure will enable itself for remote access at deployment time:
-
-**Note: Test Kitchen currently uses WinRM over HTTP rather than HTTPS. This means the temporary machine credentials traverse the internet in the clear. This will be changed once Test Kitchen fully supports WinRM over a secure channel.**
+Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2012 R2 instance, using WinRM as the transport. The resource created in Azure will enable itself for remote access at deployment time (it does this by customizing the machine at provisioning time):
 
 ```yaml
 ---
@@ -114,17 +114,6 @@ platforms:
       image_urn: MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest
     transport:
       name: winrm
-  - name: windows2008-r2
-    driver_config:
-      image_urn: MicrosoftWindowsServer:WindowsServer:2008-R2-SP1:latest
-      winrm_powershell_script: |-
-        winrm quickconfig -q
-        winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="512"}'
-        winrm set winrm/config '@{MaxTimeoutms="1800000"}'
-        winrm set winrm/config/service '@{AllowUnencrypted="true"}'
-        winrm set winrm/config/service/auth '@{Basic="true"}'
-    transport:
-      name: winrm
 suites:
   - name: default
     run_list:
@@ -246,6 +235,45 @@ suites:
     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```
+
+Note that the ```use_managed_disks``` option should be set to false until supported by AzureUSGovernment.
+
+### Example .kitchen.yml for Azure US Government cloud
+
+```yaml
+---
+driver:
+  name: azurerm
+
+driver_config:
+  subscription_id: 'abcdabcd-YOUR-GUID-HERE-abcdabcdabcd'
+  azure_environment: 'AzureUSGovernment'
+  location: 'US Gov Iowa'
+  machine_size: 'Standard_D2_v2_Promo'
+  use_managed_disks: false
+
+provisioner:
+  name: chef_zero
+
+verifier:
+  name: inspec
+
+platforms:
+- name: ubuntu1604
+  driver_config:
+    image_urn: Canonical:UbuntuServer:16.04-LTS:latest
+  transport:
+    ssh_key: ~/.ssh/id_kitchen-azurerm
+
+suites:
+  - name: default
+    run_list:
+      - recipe[vmtesting::default]
+```
+
 ### How to retrieve the image_urn
 You can use the azure (azure-cli) command line tools to interrogate for the Urn. All 4 parts of the Urn must be specified, though the last part can be changed to "latest" to indicate you always wish to provision the latest operating system and patches.
 
@@ -285,6 +313,7 @@ info:    vm image list command OK
 - The ```storage_account_type``` parameter defaults to 'Standard_LRS' and allows you to switch to premium storage (e.g. 'Premium_LRS')
 - 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).
 
 ## Contributing
 

data/lib/kitchen/driver/azurerm.rb

@@ -76,6 +76,10 @@ module Kitchen
         false
       end
 
+      default_config(:use_managed_disks) do |_config|
+        true
+      end
+
       def create(state)
         state = validate_state(state)
         image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(':', 4)
@@ -163,7 +167,7 @@ module Kitchen
         state[:uuid] = SecureRandom.hex(8) unless existing_state_value?(state, :uuid)
         state[:server_id] = "vm#{state[:uuid]}" unless existing_state_value?(state, :server_id)
         state[:azure_resource_group_name] = azure_resource_group_name unless existing_state_value?(state, :azure_resource_group_name)
-        [:subscription_id, :username, :password, :vm_name, :azure_environment].each do |config_element|
+        [:subscription_id, :username, :password, :vm_name, :azure_environment, :use_managed_disks].each do |config_element|
           state[config_element] = config[config_element] unless existing_state_value?(state, config_element)
         end
         state.delete(:password) unless instance.transport[:ssh_key].nil?
@@ -376,10 +380,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]))
+          virtual_machine_deployment_template_file('public.erb', vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks])
         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]))
+          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])
         end
       end
 

data/templates/internal.erb

@@ -107,6 +107,7 @@
         "provider": "[toUpper('33194f91-eb5f-4110-827a-e95f640a9e46')]"
     },
     "resources": [
+        <%- unless use_managed_disks -%>
         {
             "type": "Microsoft.Storage/storageAccounts",
             "name": "[parameters('newStorageAccountName')]",
@@ -119,6 +120,7 @@
                 "provider": "[variables('provider')]"
             }
         },
+        <%- end -%>
         <%- if public_ip -%>
         {
             "apiVersion": "2015-05-01-preview",
@@ -169,12 +171,14 @@
             }
         },
         {
-            "apiVersion": "2015-06-15",
+            "apiVersion": "2016-04-30-preview",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
-            "dependsOn": [
+            "dependsOn": [ 
+                <%- unless use_managed_disks -%>
                 "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
+                <%- end -%>
                 "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
             ],
             "properties": {
@@ -193,6 +197,7 @@
                         "sku": "[parameters('imageSku')]",
                         "version": "[parameters('imageVersion')]"
                     },
+                    <%- unless use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
                         "vhd": {
@@ -201,6 +206,13 @@
                         "caching": "ReadWrite",
                         "createOption": "FromImage"
                     }
+                    <%- end -%>
+                    <%- if use_managed_disks -%>
+                    "osDisk": {
+                        "name": "osdisk",
+                        "createOption": "FromImage"
+                    }
+                    <%- end -%>
                 },
                 "networkProfile": {
                     "networkInterfaces": [
@@ -210,10 +222,12 @@
                     ]
                 },
                 "diagnosticsProfile": {
+                    <%- unless use_managed_disks -%>
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
                         "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
                     }
+                    <%- end -%>
                 }
             },
             "tags": {

data/templates/public.erb

@@ -82,9 +82,9 @@
         },
         "bootDiagnosticsEnabled": {
             "type": "string",
-            "defaultValue": "true",
+            "defaultValue": "false",
             "metadata": {
-                "description": "Whether to enable (true) or disable (false) boot diagnostics. Default: true (requires Standard storage)."
+                "description": "Whether to enable (true) or disable (false) boot diagnostics. Default: false."
             }
         }
     },
@@ -107,6 +107,7 @@
         "provider": "[toUpper('33194f91-eb5f-4110-827a-e95f640a9e46')]"
     },
     "resources": [
+        <%- unless use_managed_disks -%>
         {
             "type": "Microsoft.Storage/storageAccounts",
             "name": "[parameters('newStorageAccountName')]",
@@ -119,6 +120,7 @@
                 "provider": "[variables('provider')]"
             }
         },
+        <%- end -%>
         {
             "apiVersion": "2015-05-01-preview",
             "type": "Microsoft.Network/publicIPAddresses",
@@ -188,12 +190,14 @@
             }
         },
         {
-            "apiVersion": "2015-06-15",
+            "apiVersion": "2016-04-30-preview",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
             "dependsOn": [
+                <%- unless use_managed_disks -%>
                 "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
+                <%- end -%>
                 "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
             ],
             "properties": {
@@ -212,6 +216,7 @@
                         "sku": "[parameters('imageSku')]",
                         "version": "[parameters('imageVersion')]"
                     },
+                    <%- unless use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
                         "vhd": {
@@ -220,6 +225,13 @@
                         "caching": "ReadWrite",
                         "createOption": "FromImage"
                     }
+                    <%- end -%>
+                    <%- if use_managed_disks -%>
+                    "osDisk": {
+                        "name": "osdisk",
+                        "createOption": "FromImage"
+                    }
+                    <%- end -%>
                 },
                 "networkProfile": {
                     "networkInterfaces": [
@@ -229,10 +241,12 @@
                     ]
                 },
                 "diagnosticsProfile": {
+                    <%- unless use_managed_disks -%>
                     "bootDiagnostics": {
                         "enabled": "[parameters('bootDiagnosticsEnabled')]",
                         "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName')), '2015-06-15').primaryEndpoints.blob]"
                     }
+                    <%- end -%>
                 }
             },
             "tags": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile