cheese-chef-provisioning-azurerm 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a42dcbfec41ef166c44fda1953c68b13cd2ba05
-  data.tar.gz: 7394b5f6a7df6532a772040b026852ae7b1a30fb
+  metadata.gz: 63a6e6149ea3283667ba760b2740d32ad76635f3
+  data.tar.gz: bf99a9dbadc303908e7f903f55c7a5b4909ad0dc
 SHA512:
-  metadata.gz: 51c90e3f4f5c0de61fc4969035908d23cfb3fb9a29f8dc27b3b01535b2dc710a77a32c9bc185005afa39af01df652e07a7ad0539d165bf57ebd191d89b3171cd
-  data.tar.gz: 9463071f66eba7fd6eca9cf1237bc0223cf3d0af94013be9886d9d91e1c30a5b759ff09f9855e17e43f33640868736f05cd62d219ba19e40ddcf6811fec1dae4
+  metadata.gz: b27108b6cc386f8b88f2bfd0a51dce3b1d5da6c651fea8e62eb74532616d4af6ec285538f2af7394ef9777e21da0f4b81b0c17c2d0c1330e7d07d69281b3464d
+  data.tar.gz: 2ad8d9e57e5cd6efc36faa34782b844c91dbf127ff3074008216a5df03a56a6846270424e43744ea0b1575764cf23f66ba53cc234a9d626b59bbdc58e10560e4

data/README.md

@@ -86,6 +86,7 @@ with_machine_options({
     :subnet_name => "network-az-us-west-2", # subnet where NIC will be created for VM
     :network_security_group_name => "admin-sg", # security group to be applied on NIC
     :key_name => "azure-key", # name of the key to be used to ssh into VM
+    :availability_set => "availability-set", # https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/virtualmachines-create-or-update#avset
     :osProfile => { # OS profile as specified here https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/virtualmachines-create-or-update#osprofile
       :computerName => "test1", # hostname of VM
       :adminUsername => "ubuntu", # username for VM
@@ -125,11 +126,9 @@ This list is in the order of preference
 - `machine_options[:bootstrap_options][:location]`
 - `machine_options[:location]`
 
-
 ## Example Recipe - deployment of machine
 The following recipe creates a new VM within your subscription (identified by the GUID on line 2).  
 
-
 ### example1.rb
 
 ```ruby
@@ -151,6 +150,7 @@ with_machine_options({
     :subnet_name => "network-az-us-west-2",
     :network_security_group_name => "admin-sg",
     :key_name => "azure-key",
+    :availability_set => "availability-set",
     :osProfile => {
       :computerName => "test1",
       :adminUsername => "ubuntu",
@@ -183,6 +183,99 @@ with_machine_options({
 
 machine "test1" do
 end
+```
+
+# Resources
+## azure_data_disk
+
+This resource is used to create and manage [managed disks](https://docs.microsoft.com/en-us/rest/api/manageddisks/disks/disks-create-or-update) of azurerm. Azure supports several [create options](http://www.rubydoc.info/gems/azure_mgmt_compute/0.10.0/Azure/ARM/Compute/Models/DiskCreateOption) to create managed disk. But this driver only supports `Empty` disk creation as a default option.   
+
+### attributes
+```
+attribute :name, kind_of: String, name_attribute: true
+attribute :resource_group, String, required: true
+attribute :size, kind_of: Integer, default: 10 # in gb
+attribute :storage_account_type, String, default: 'Standard_LRS'
+attribute :caching, String, default: 'none'
+attribute :lun, Integer
+attribute :tags, kind_of: Hash
+attribute :vm, String
+attribute :location, String
+```
+
+#### `vm` and `location`
+One must be specified while creating a new disk. And if both specified, `vm` takes precedence over `location`.
+
+#### `size`
+Azure supports disk size expansion so does this driver, but only at a certain condition.   
+When a disk is already created and not attached, `:create` action can be used to attach the disk to a VM and if a larger size is specified, it will expand the disk too. But if size is reduced in same case scenario, it will just warn and attach the disk to the VM.
+
+### actions
+
+#### create
+This action will create an empty managed disk. Behaviour of this action varies based `vm` attribute.   
+- case 1: when `vm` not provided   
+A new empty disk will be created.   
+- case 2: when `vm` is provided   
+The disk will be added to the VM. In case disk already exist and is attached to a different VM, it will raise an error.
+
+#### destroy
+- case 1: when disk is not attached   
+The disk will be destroyed.
+- case 2: when disk is attached to a VM   
+The `vm` needs to be specified to detach and destroy disk, else it will raise an error.
+
+#### attach
+This action can be used when disk is already available and needs to be attached to a VM. Using `:attach` action will raise error if disk is not already created.    
+If you are not sure about disk and still wants a disk to be attached to the VM, use `:create` action.
+
+#### detach
+This action will detach the disk from provided VM. If `vm` is not specified, it will raise error.
+
+### Example
+- Creating and attaching disk to VM
+
+```
+azure_data_disk 'disk-test1' do
+  size 12
+  vm 'disk-test1' # required in this case
+  resource_group 'resource-group'
+end
+```
 
+- Creating an empty disk
 
 ```
+azure_data_disk 'disk-test2' do
+  size 12
+  location 'West US 2' # required in this case
+  resource_group 'resource-group'
+end
+```
+
+- Attaching existing disk to a VM
+
+```
+azure_data_disk 'disk-test2' do
+  vm 'disk-test2' # required in this case
+  resource_group 'resource-group'
+end
+```
+
+- Expanding size of disk
+
+```
+azure_data_disk 'detaching disk' do
+  name 'disk-test2'
+  vm 'disk-test2' # required in this case
+  resource_group 'resource-group'
+  action :detach
+end
+
+azure_data_disk 're-attaching with bigger size' do
+  name 'disk-test2'
+  size 20
+  vm 'disk-test2' # required in this case
+  resource_group 'resource-group'
+end
+```

data/lib/chef/provisioning/azurerm/driver.rb

@@ -96,6 +96,7 @@ class Chef
           vm_name = machine_spec.name
           location = bootstrap_options[:location] || machine_options[:location]
           resource_group_name = bootstrap_options[:resource_group_name]
+          availability_set = bootstrap_options[:availability_set]
           osProfile = bootstrap_options[:osProfile]
           network_security_group_name = bootstrap_options[:network_security_group_name]
           tags = bootstrap_options[:tags]
@@ -111,6 +112,15 @@ class Chef
           Chef::Log.debug "Azure machine_options: #{machine_options.inspect}"
           action_handler.report_progress "Creating #{machine_spec.name} in #{location} with supplied parameters..."
 
+          if availability_set
+            action_handler.report_progress "Looking for availability_set #{availability_set}."
+            availability_set_id = azure_vm_service.availability_sets.get(resource_group_name, availability_set).id
+            raise "availability_set #{availability_set}  under resource group #{resource_group_name} was not found." unless availability_set_id
+            availabilitySet = MsRestAzure::SubResource.new.tap do |subResource|
+              subResource.id = availability_set_id
+            end
+          end
+
           action_handler.report_progress "Preparing OS disk for the VM #{vm_name}..."
           begin
             os_disk_exist = azure_vm_service.disks.get(resource_group_name, "#{vm_name}_os_disk")
@@ -119,22 +129,18 @@ class Chef
           end
           if os_disk_exist
             action_handler.report_progress "OS disk with the name #{vm_name}_os_disk already exist."
-            if machine_spec.reference
-              action_handler.report_progress "checking attached status..."
-              if os_disk_exist.owner_id.nil?
-                action_handler.report_progress "OS disk #{vm_name} not attached to any VM. Using this..."
-                os_disk = Azure::ARM::Compute::Models::OSDisk.new.tap do |os_disk|
-                  os_disk.create_option = 'attach'
-                  os_disk.os_type = machine_spec.reference['is_windows'] ? 'Windows' : 'Linux'
-                  os_disk.managed_disk = Azure::ARM::Compute::Models::ManagedDiskParameters.new.tap do |managedDisk|
-                    managedDisk.id = os_disk_exist.id
-                  end
+            action_handler.report_progress "checking attached status..."
+            if os_disk_exist.owner_id.nil?
+              action_handler.report_progress "OS disk #{vm_name} not attached to any VM. Using this..."
+              os_disk = Azure::ARM::Compute::Models::OSDisk.new.tap do |os_disk|
+                os_disk.create_option = 'attach'
+                os_disk.os_type = machine_spec.reference['is_windows'] ? 'Windows' : 'Linux'
+                os_disk.managed_disk = Azure::ARM::Compute::Models::ManagedDiskParameters.new.tap do |managedDisk|
+                  managedDisk.id = os_disk_exist.id
                 end
-              else
-                raise "OS disk #{vm_name} attached to a VM. Contact your cloud administrator or change VM name."
               end
             else
-              raise "This is a new VM creation with Chef Provisioning and will not use existing cloud resources"
+              raise "OS disk #{vm_name} attached to a VM. Contact your cloud administrator or change VM name."
             end
           else
             os_disk = Azure::ARM::Compute::Models::OSDisk.new.tap do |os_disk|
@@ -159,16 +165,12 @@ class Chef
           end
           if nic_exist
             action_handler.report_progress "network interface with the name #{vm_name} already exist."
-            if machine_spec.reference
-              action_handler.report_progress "checking attached status..."
-              if nic_exist.virtual_machine.nil?
-                action_handler.report_progress "network interface #{vm_name} not attached to any VM. Using this..."
-                nic = nic_exist
-              else
-                raise "network interface #{vm_name} attached to a VM. Contact your cloud administrator or change VM name."
-              end
+            action_handler.report_progress "checking attached status..."
+            if nic_exist.virtual_machine.nil?
+              action_handler.report_progress "network interface #{vm_name} not attached to any VM. Using this..."
+              nic = nic_exist
             else
-              raise "This is a new VM creation with Chef Provisioning and will not use existing cloud resources"
+              raise "network interface #{vm_name} attached to a VM. Contact your cloud administrator or change VM name."
             end
           else
             begin
@@ -195,6 +197,7 @@ class Chef
 
           vm_create_params = Azure::ARM::Compute::Models::VirtualMachine.new.tap do |vm|
             vm.location = location
+            vm.availability_set = availabilitySet if availability_set && availability_set_id
             vm.tags = tags if tags
             vm.os_profile = Azure::ARM::Compute::Models::OSProfile.new.tap do |os_profile|
               os_profile.computer_name = computerName if computerName

data/lib/chef/provisioning/azurerm/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module AzureRM
-      VERSION = '1.0.5'.freeze
+      VERSION = '1.0.6'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheese-chef-provisioning-azurerm
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Stuart Preston