cheese-chef-provisioning-azurerm 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd53a70d8bfd0e4caf6fcc087dc766c4ebd8b09
-  data.tar.gz: 3bb6edada005df509ef2708873a5a5b0ede8617c
+  metadata.gz: c5c47e2b7a91c076c2c010a02370d37bc2beb132
+  data.tar.gz: e8aaaa45c30b2af2098c67e959f37326ee7e44d4
 SHA512:
-  metadata.gz: 220b6f59eaeb8ea3b7a4f8101017aa29f0687950f4d761464071ad628161cd034273a5832b5315810b59049ae056d534f4ce15bfdf77cf3c076a36d2c7b7ceee
-  data.tar.gz: 51b8efd3b60eaea97451900000f45a137ac238c80038d1460992cebe528a209bc4cecedae4d2cff3c5be26a5eab28b81aeb89ce1cffbb249a14e2dc75b5fa164
+  metadata.gz: 981d9906121adf3e10bac08aad928f0ec335b703d86099e313e1880fdb88ba0253728227a61c39bff9f3c070cf5de9af543a1556f9b087529fed7fb0b72b52c5
+  data.tar.gz: 2fde2c7d49c8f17a4d1cc55cb0ecdcfac8c4bbd9a54cd06d3c8270a44e27ae7835bdc9d369b5dadd46e47e9776abd96a8d73f7f25b719e4d6a8bdce8485c8297

data/lib/chef/provider/azure_data_disk.rb

@@ -101,13 +101,13 @@ class Chef
 
       def data_disk_owner_id
         try_azure_operation('getting data disk') do
-          compute_management_client.disks.get(new_resource.resource_group, new_resource.name).owner_id
+          compute_management_client.disks.get(new_resource.resource_group, new_resource.name).managed_by
         end
       end
 
       def data_disk_owner_id_silent
         try_azure_operation('getting data disk', true) do
-          compute_management_client.disks.get(new_resource.resource_group, new_resource.name).owner_id
+          compute_management_client.disks.get(new_resource.resource_group, new_resource.name).managed_by
         end
       end
 

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

@@ -112,7 +112,26 @@ class Chef
 
           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
+            begin
+              availability_set_id = azure_vm_service.availability_sets.get(resource_group_name, availability_set).id
+            rescue MsRestAzure::AzureOperationError => e
+              if e.error_code.eql?('ResourceNotFound')
+                action_handler.report_progress "availability_set #{availability_set} not found, Creating it..."
+                sku = Azure::ARM::Compute::Models::Sku.new.tap do |sku|
+                  sku.name = 'Aligned'
+                end
+                aSet = Azure::ARM::Compute::Models::AvailabilitySet.new.tap do |set|
+                  set.platform_fault_domain_count = 3
+                  set.platform_update_domain_count = 3
+                  set.location = location
+                  set.sku = sku
+                end
+                res = azure_vm_service.availability_sets.create_or_update(resource_group_name, availability_set, aSet)
+                availability_set_id = res.id
+              else
+                raise e
+              end
+            end
             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
@@ -128,7 +147,7 @@ class Chef
           if os_disk_exist
             action_handler.report_progress "OS disk with the name #{vm_name}_os_disk already exist."
             action_handler.report_progress 'checking attached status...'
-            if os_disk_exist.owner_id.nil?
+            if os_disk_exist.managed_by.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'
@@ -359,8 +378,9 @@ class Chef
             end
           end
 
-          probe = Azure::ARM::Network::Models::Probe.new.tap do |prb|
-            lb_options[:probes].each do |prbes|
+          probes = []
+          lb_options[:probes].each do |prbes|
+            probe = Azure::ARM::Network::Models::Probe.new.tap do |prb|
               prb.name = prbes[:name]
               prb.port = prbes[:port]
               prb.protocol = prbes[:protocol]
@@ -372,6 +392,7 @@ class Chef
               prb.interval_in_seconds = prbes[:interval_in_seconds]
               prb.number_of_probes = prbes[:number_of_probes]
             end
+            probes.push(probe)
           end
 
           lb = Azure::ARM::Network::Models::LoadBalancer.new.tap do |lbinfo|
@@ -379,7 +400,7 @@ class Chef
             lbinfo.tags = tags
             lbinfo.frontend_ipconfigurations = [frontend_ipconf]
             lbinfo.backend_address_pools = backend_pool
-            lbinfo.probes = [probe]
+            lbinfo.probes = probes
           end
 
           lb_update(resource_group, lb_spec.name, lb) # inital build
@@ -389,11 +410,18 @@ class Chef
           machine_specs.each do |ivm|
             vmnic = azure_net_service.network_interfaces.get(resource_group, ivm.name)
             mylb.backend_address_pools.each do |pool|
-              vmnic.ip_configurations.first.load_balancer_backend_address_pools = [pool] # mylb.backend_address_pools
+              lb_backend_pools = vmnic.ip_configurations.first.load_balancer_backend_address_pools
+              if lb_backend_pools
+                lb_backend_pools.each do |backend_pool|
+                  next if backend_pool.id.eql?(pool.id)
+                  vmnic.ip_configurations.first.load_balancer_backend_address_pools.push(pool)
+                end
+              else
+                vmnic.ip_configurations.first.load_balancer_backend_address_pools = [pool]
+              end
               azure_net_service.network_interfaces.create_or_update(resource_group, ivm.name, vmnic)
             end
           end
-
           frontend_ipconf_sub = MsRestAzure::SubResource.new.tap do |subresource|
             subresource.id = azure_net_service.load_balancers.get(resource_group, lb_spec.name).frontend_ipconfigurations.first.id
           end
@@ -402,13 +430,12 @@ class Chef
             subresource.id = mylb.backend_address_pools.first.id
           end
 
-          probe_sub = MsRestAzure::SubResource.new.tap do |subresource|
-            subresource.id = azure_net_service.load_balancers.get(resource_group, lb_spec.name).probes.first.id
-          end
-
           unless lb_options[:inboundNatRules].nil?
-            inboudnat = Azure::ARM::Network::Models::InboundNatRule.new.tap do |inat|
-              lb_options[:inboundNatRules].each do |ibnat|
+            inboudnats = []
+            inat_machines = {}
+            lb_options[:inboundNatRules].each do |ibnat|
+              inboudnat = Azure::ARM::Network::Models::InboundNatRule.new.tap do |inat|
+                inat_machines[ibnat[:name]] = find_vm_name(machine_specs, ibnat[:backend_ipconfiguration])
                 inat.name = ibnat[:name]
                 inat.frontend_port = ibnat[:frontend_port]
                 inat.backend_port = ibnat[:backend_port]
@@ -417,11 +444,16 @@ class Chef
                 inat.idle_timeout_in_minutes = ibnat[:idle_timeout_in_minutes]
                 inat.frontend_ipconfiguration = frontend_ipconf_sub
               end
+              inboudnats.push(inboudnat)
             end
           end
 
-          lbrules = Azure::ARM::Network::Models::LoadBalancingRule.new.tap do |lbrs|
-            lb_options[:loadBalancingRules].each do |lbr|
+          lbrules = []
+          lb_options[:loadBalancingRules].each do |lbr|
+            probe_sub = MsRestAzure::SubResource.new.tap do |subresource|
+              subresource.id = find_probe_id(resource_group, lb_spec.name, lbr[:probe])
+            end
+            lbrule = Azure::ARM::Network::Models::LoadBalancingRule.new.tap do |lbrs|
               lbrs.name = lbr[:name]
               lbrs.backend_address_pool = backend_ipconf_sub
               lbrs.protocol = lbr[:protocol]
@@ -434,6 +466,7 @@ class Chef
               lbrs.backend_address_pool = backend_ipconf_sub
               lbrs.probe = probe_sub
             end
+            lbrules.push(lbrule)
           end
 
           lb = Azure::ARM::Network::Models::LoadBalancer.new.tap do |lbinfo|
@@ -442,12 +475,48 @@ class Chef
             lbinfo.frontend_ipconfigurations = [frontend_ipconf]
             lbinfo.backend_address_pools = backend_pool
             unless lb_options[:inboundNatRules].nil?
-              lbinfo.inbound_nat_rules = [inboudnat]
+              lbinfo.inbound_nat_rules = inboudnats
             end
-            lbinfo.probes = [probe]
-            lbinfo.load_balancing_rules = [lbrules]
+            lbinfo.probes = probes
+            lbinfo.load_balancing_rules = lbrules
           end
+
           lb_update(resource_group, lb_spec.name, lb) # update additions build
+          mylb = azure_net_service.load_balancers.get(resource_group, lb_spec.name)
+          if lb_options[:inboundNatRules]
+            mylb.inbound_nat_rules.each do |inat|
+              vm_name = inat_machines[inat.name]
+              vmnic = azure_net_service.network_interfaces.get(resource_group, vm_name)
+              lb_inbound_nat_rules = vmnic.ip_configurations.first.load_balancer_inbound_nat_rules
+              if lb_inbound_nat_rules
+                lb_inbound_nat_rules.each do |inat_rule|
+                  next if inat_rule.id.eql?(inat.id)
+                  vmnic.ip_configurations.first.load_balancer_inbound_nat_rules.push(inat)
+                end
+              else
+                vmnic.ip_configurations.first.load_balancer_inbound_nat_rules = [inat]
+              end
+              azure_net_service.network_interfaces.create_or_update(resource_group, vm_name, vmnic)
+            end
+          end
+
+          lb_spec.reference = {
+            'frontend_ipconfigurations' => mylb.frontend_ipconfigurations.first.private_ipaddress,
+            'allocated_at' => Time.now.utc.to_s,
+          }
+        end
+
+        def find_vm_name(machine_specs, vm_name)
+          machine_specs.each do |vm|
+            return vm.name if vm.name.include?(vm_name)
+          end
+        end
+
+        def find_probe_id(resource_group, lb_name, probe_name)
+          probes = azure_net_service.load_balancers.get(resource_group, lb_name).probes
+          probes.each do |probe|
+            return probe.id if probe.name.eql?(probe_name)
+          end
         end
 
         def lb_update(resource_group, name, lb)
@@ -457,6 +526,9 @@ class Chef
         def destroy_load_balancer(action_handler, lb_spec, lb_options)
           raise "#{lb_spec.name} hasn't recived a resource group. Unable to destroy." unless lb_options.resource_group
           azure_net_service.load_balancers.delete(lb_options.resource_group, lb_spec.name)
+
+          # Remove LB spec from databag
+          lb_spec.delete(action_handler)
         end
 
         private

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

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module AzureRM
-      VERSION = '1.0.8'.freeze
+      VERSION = '1.0.9'.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.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Stuart Preston
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,84 +17,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.17'
+        version: 12.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.17'
+        version: 12.20.3
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement