kitchen-azurerm 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d376f93f6c1326b5bfeeb9db4e1b2555a0c5546b
-  data.tar.gz: 5d210183f6eb3d2e2d144273dca1f563b8affe32
+  metadata.gz: 5d41d3dc84115d01efb811a9b47efadad76b3dbf
+  data.tar.gz: 0caf860272a7d70f7356889b2b1b013123541a53
 SHA512:
-  metadata.gz: 7b173321456444b901db656894016df02b745af81891a69c355809699a630a9726095d6266b9684c1b21b287e2330bd865a05689cc711b41b65a14bdfe8c428f
-  data.tar.gz: 752c0245584209c860860b0b4bd5270790b8752f6cddece95f273705c7b806bfc6080eb7fc76a137d3de8e3912c9aa9507c1108a2f960132cd1f8451da6b50d0
+  metadata.gz: 48b2098a84cf1a4c68e6289578cfa94c2d9e7fc769ce7ff77691d0df6f86a4f642594497be6569a120afa3107ad747cef38a4ad8b808c9ddc70ad63065e485e1
+  data.tar.gz: 536e2e842cee0d13ec3b06819256608bb0f0c879e9417ce0ca66a6ed66b771061dcc8ad808facd85fc20210288eb6da866ba7ed1f0c6fe04a89c1b8866404870

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # kitchen-azurerm Changelog
 
+## [0.5.0] - 2016-08-07
+- Adding support for internal (e.g. ExpressRoute/VPN) access to created VM (@stuartpreston)
+
+## [0.4.1] - 2016-07-01
+- Adding explicit depdendency on concurrent-ruby gem (@stuartpreston)
+
 ## [0.4.0] - 2016-06-26
 - Adding capability to execute ARM template prior to VM deployment, ```pre_deployment_template``` and ```pre_deployment_parameters``` added (@stuartpreston)
 

data/README.md

@@ -205,6 +205,44 @@ Example predeploy.json:
 }
 ```
 
+### .kitchen.yml example 4 - deploy VM to existing virtual network/subnet (use for ExpressRoute/VPN scenarios)
+
+The following example introduces the ```vnet_id``` and ```subnet_id``` properties under driver_config in the configuration file.  This can be applied at the top level, or per platform.
+You can use this capability to create the VM on an existing virtual network and subnet created in a different resource group.
+
+In this case, the public IP address is not used.
+
+
+```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_urn: Canonical:UbuntuServer:14.04.4-LTS:latest
+      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:
+```
+
 ### 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.
 

data/lib/kitchen/driver/azurerm.rb

@@ -35,6 +35,14 @@ module Kitchen
         'vm'
       end
 
+      default_config(:vnet_id) do |_config|
+        ''
+      end
+
+      default_config(:subnet_id) do |_config|
+        ''
+      end
+
       default_config(:storage_account_type) do |_config|
         'Standard_LRS'
       end
@@ -124,12 +132,22 @@ module Kitchen
         # Monitor all operations until completion
         follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
 
-        # Now retrieve the public IP from the resource group:
-        network_management_client = ::Azure::ARM::Network::NetworkResourceProviderClient.new(credentials)
-        network_management_client.subscription_id = config[:subscription_id]
-        result = network_management_client.public_ip_addresses.get(state[:azure_resource_group_name], 'publicip').value!
-        info "IP Address is: #{result.body.properties.ip_address} [#{result.body.properties.dns_settings.fqdn}]"
-        state[:hostname] = result.body.properties.ip_address
+        if config[:vnet_id] == ''
+          # Retrieve the public IP from the resource group:
+          network_management_client = ::Azure::ARM::Network::NetworkResourceProviderClient.new(credentials)
+          network_management_client.subscription_id = config[:subscription_id]
+          result = network_management_client.public_ip_addresses.get(state[:azure_resource_group_name], 'publicip').value!
+          info "IP Address is: #{result.body.properties.ip_address} [#{result.body.properties.dns_settings.fqdn}]"
+          state[:hostname] = result.body.properties.ip_address
+        else
+          # Retrieve the internal IP from the resource group:
+          network_management_client = ::Azure::ARM::Network::NetworkResourceProviderClient.new(credentials)
+          network_management_client.subscription_id = config[:subscription_id]
+          network_interfaces = ::Azure::ARM::Network::NetworkInterfaces.new(network_management_client)
+          result = network_interfaces.get(state[:azure_resource_group_name], 'nic').value!
+          info "IP Address is: #{result.body.properties.ip_configurations[0].properties.private_ipaddress}"
+          state[:hostname] = result.body.properties.ip_configurations[0].properties.private_ipaddress
+        end
       end
 
       def existing_state_value?(state, property)
@@ -339,6 +357,207 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
       end
 
       def virtual_machine_deployment_template
+        if config[:vnet_id] == ''
+          return virtual_machine_deployment_template_public
+        else
+          info "Using custom vnet: #{config[:vnet_id]}"
+          return virtual_machine_deployment_template_internal(config[:vnet_id], config[:subnet_id])
+        end
+      end
+
+      def virtual_machine_deployment_template_internal(vnet_id, subnet_id)
+        <<-EOH
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "location": {
+            "type": "string",
+            "metadata": {
+                "description": "The location where the resources will be created."
+            }
+        },
+        "vmSize": {
+            "type": "string",
+            "metadata": {
+                "description": "The size of the VM to be created"
+            }
+        },
+        "newStorageAccountName": {
+            "type": "string",
+            "metadata": {
+                "description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed."
+            }
+        },
+        "adminUsername": {
+            "type": "string",
+            "metadata": {
+                "description": "User name for the Virtual Machine."
+            }
+        },
+        "adminPassword": {
+            "type": "securestring",
+            "metadata": {
+                "description": "Password for the Virtual Machine."
+            }
+        },
+        "dnsNameForPublicIP": {
+            "type": "string",
+            "metadata": {
+                "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
+            }
+        },
+        "imagePublisher": {
+            "type": "string",
+            "defaultValue": "Canonical",
+            "metadata": {
+                "description": "Publisher for the VM, e.g. Canonical, MicrosoftWindowsServer"
+            }
+        },
+        "imageOffer": {
+            "type": "string",
+            "defaultValue": "UbuntuServer",
+            "metadata": {
+                "description": "Offer for the VM, e.g. UbuntuServer, WindowsServer."
+            }
+        },
+        "imageSku": {
+            "type": "string",
+            "defaultValue": "14.04.3-LTS",
+            "metadata": {
+                "description": "Sku for the VM, e.g. 14.04.3-LTS"
+            }
+        },
+        "imageVersion": {
+            "type": "string",
+            "defaultValue": "latest",
+            "metadata": {
+                "description": "Either a date or latest."
+            }
+        },
+        "vmName": {
+            "type": "string",
+            "defaultValue": "vm",
+            "metadata": {
+                "description": "The vm name created inside of the resource group."
+            }
+        },
+        "storageAccountType": {
+            "type": "string",
+            "defaultValue": "Standard_LRS",
+            "metadata": {
+                "description": "The type of storage to use (e.g. Standard_LRS or Premium_LRS)."
+            }
+        },
+        "bootDiagnosticsEnabled": {
+            "type": "string",
+            "defaultValue": "true",
+            "metadata": {
+                "description": "Whether to enable (true) or disable (false) boot diagnostics. Default: true (requires Standard storage)."
+            }
+        }
+    },
+    "variables": {
+        "location": "[parameters('location')]",
+        "OSDiskName": "osdisk",
+        "nicName": "nic",
+        "addressPrefix": "10.0.0.0/16",
+        "subnetName": "#{subnet_id}",
+        "subnetPrefix": "10.0.0.0/24",
+        "storageAccountType": "[parameters('storageAccountType')]",
+        "publicIPAddressName": "publicip",
+        "publicIPAddressType": "Dynamic",
+        "vmStorageAccountContainerName": "vhds",
+        "vmName": "[parameters('vmName')]",
+        "vmSize": "[parameters('vmSize')]",
+        "virtualNetworkName": "vnet",
+        "vnetID": "#{vnet_id}",
+        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+    },
+    "resources": [
+        {
+            "type": "Microsoft.Storage/storageAccounts",
+            "name": "[parameters('newStorageAccountName')]",
+            "apiVersion": "2015-05-01-preview",
+            "location": "[variables('location')]",
+            "properties": {
+                "accountType": "[variables('storageAccountType')]"
+            }
+        },
+        {
+            "apiVersion": "2015-05-01-preview",
+            "type": "Microsoft.Network/networkInterfaces",
+            "name": "[variables('nicName')]",
+            "location": "[variables('location')]",
+            "properties": {
+                "ipConfigurations": [
+                    {
+                        "name": "ipconfig1",
+                        "properties": {
+                            "privateIPAllocationMethod": "Dynamic",
+                            "subnet": {
+                                "id": "[variables('subnetRef')]"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "apiVersion": "2015-06-15",
+            "type": "Microsoft.Compute/virtualMachines",
+            "name": "[variables('vmName')]",
+            "location": "[variables('location')]",
+            "dependsOn": [
+                "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
+                "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+            ],
+            "properties": {
+                "hardwareProfile": {
+                    "vmSize": "[variables('vmSize')]"
+                },
+                "osProfile": {
+                    "computername": "[variables('vmName')]",
+                    "adminUsername": "[parameters('adminUsername')]",
+                    "adminPassword": "[parameters('adminPassword')]"
+                },
+                "storageProfile": {
+                    "imageReference": {
+                        "publisher": "[parameters('imagePublisher')]",
+                        "offer": "[parameters('imageOffer')]",
+                        "sku": "[parameters('imageSku')]",
+                        "version": "[parameters('imageVersion')]"
+                    },
+                    "osDisk": {
+                        "name": "osdisk",
+                        "vhd": {
+                            "uri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
+                        },
+                        "caching": "ReadWrite",
+                        "createOption": "FromImage"
+                    }
+                },
+                "networkProfile": {
+                    "networkInterfaces": [
+                        {
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]"
+                        }
+                    ]
+                },
+                "diagnosticsProfile": {
+                    "bootDiagnostics": {
+                        "enabled": "[parameters('bootDiagnosticsEnabled')]",
+                        "storageUri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net')]"
+                    }
+                }
+            }
+        }
+    ]
+}
+        EOH
+      end
+
+      def virtual_machine_deployment_template_public
         <<-EOH
 {
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -98,16 +98,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.