foreman_azure_rm 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f6ca7eb686ea697b8c9f506303f41e545e46e2ad5aeb72fe376edb9780ee64
-  data.tar.gz: bfd45c748455ba48ced60736ec4682708a223e862fc726e567eeb424c27fa874
+  metadata.gz: 4c5017c30e0067522ca79641d307a2aaef0073ee2c60eb2ec26bf7ca88c72047
+  data.tar.gz: e62b30ff6d8594136a724e0995ba7b5de4b14832cd015996d3186f0a1f4daaff
 SHA512:
-  metadata.gz: cf021fdd847e111d38db05a4ace1070dd4bbaa4d03979405a424b55eb84b94da216b36883a6bc9957ba0c6041a0301e77586b687619a9ad23742dd26229d08b1
-  data.tar.gz: d8ff32ba98f6125b0a1200b4d93491c5735c355747aba3d5e951db72c58883879b7bab6021162f5979dda3fbac6bd325c1588881a9c000b3f1725677a8627f15
+  metadata.gz: 944bbf2ce53335d33f7ed2f97ac4658408546458103be05ce6cd94bb7cc8f273d49d233adf2cbd7a137154437c0188749123e8ec73eff4d446b59a4d7f068677
+  data.tar.gz: 676ed07015b420ace8897695ba252f387577ab4b2b55d1bff62b97381ff3b53aac6ac57af99104351ec068af01af44f90770a54100a7aef1de148be039538278

data/app/models/concerns/foreman_azure_rm/vm_extensions/managed_vm.rb

@@ -176,6 +176,14 @@ module ForemanAzureRm
         logger.debug msg
         vm_create_params = ComputeModels::VirtualMachine.new.tap do |vm|
           vm.location = vm_hash[:location]
+          vm.tags = {}
+          unless vm_hash[:tags].nil?
+            arr = vm_hash[:tags].split(',')
+            arr.each do |item|
+              kv = item.split('=')
+              vm.tags[kv[0].strip] = kv[1].strip
+            end            
+          end
           unless vm_hash[:availability_set_id].nil?
             sub_resource = MsRestAzure::SubResource.new
             sub_resource.id = vm_hash[:availability_set_id]

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -59,7 +59,7 @@ module ForemanAzureRm
     end
 
     def ensure_attributes_and_values
-      validate_region
+      validate_region if validate_cloud?
     end
 
     def validate_region
@@ -67,6 +67,15 @@ module ForemanAzureRm
       errors.add(:region, "is not valid, must be lowercase eg. 'eastus'. No special characters allowed.") unless regions.collect(&:second).include?(region)
     end
 
+    def validate_cloud?
+      valid_clouds = ['azure', 'azureusgovernment', 'azurechina', 'azuregermancloud']
+      unless valid_clouds.include?(cloud)
+      	errors.add(:cloud, "is not valid. Valid choices are #{valid_clouds.join(", ")}.")
+	      return false
+      end
+      true
+    end
+
     def self.model_name
       ComputeResource.model_name
     end
@@ -321,6 +330,7 @@ module ForemanAzureRm
         script_command:                  args[:script_command],
         script_uris:                     args[:script_uris],
         nvidia_gpu_extension:            args[:nvidia_gpu_extension],
+        tags:                            args[:tags],
       )
       logger.debug "Virtual Machine #{args[:vm_name]} Created Successfully."
       # request NVIDIA GPU driver and CUDA stack
@@ -339,6 +349,7 @@ module ForemanAzureRm
         script_command: user_command,
         script_uris: args[:script_uris],
         nvidia_gpu_extension: Foreman::Cast.to_bool(args[:nvidia_gpu_extension]),
+        tags: args[:tags],
       )
     rescue RuntimeError => e
       Foreman::Logging.exception('Unhandled AzureRm error', e)

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -7,6 +7,7 @@ module ForemanAzureRm
     attr_accessor :script_command, :script_uris
     attr_accessor :nvidia_gpu_extension
     attr_accessor :volumes
+    attr_accessor :tags
 
     delegate :name, to: :azure_vm, allow_nil: true
 
@@ -17,7 +18,8 @@ module ForemanAzureRm
                    volumes: [],
                    script_command: nil,
                    script_uris: nil,
-                   nvidia_gpu_extension: false)
+                   nvidia_gpu_extension: false,
+                   tags: [])
 
       @azure_vm = azure_vm
       @sdk = sdk
@@ -27,6 +29,7 @@ module ForemanAzureRm
       @script_command ||= script_command
       @script_uris ||= script_uris
       @nvidia_gpu_extension ||= nvidia_gpu_extension
+      @tags ||= tags
       @azure_vm.hardware_profile ||= ComputeModels::HardwareProfile.new
       @azure_vm.os_profile ||= ComputeModels::OSProfile.new
       @azure_vm.os_profile.linux_configuration ||= ComputeModels::LinuxConfiguration.new

data/app/views/compute_resources_vms/form/azurerm/_base.html.erb

@@ -185,6 +185,13 @@
          }
 %>
 
+<%= text_f f, :tags,
+         {
+             :label => _('Azure Tags'),
+             :label_help => _('Comma seperated list of name=value pairs for tags on this VM in Azure')
+         }
+%>
+
 <%= checkbox_f f, :nvidia_gpu_extension,
          {
               :label => _('NVIDIA driver / CUDA'),

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.2.5'.freeze
+  VERSION = '2.2.6'.freeze
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Aditi Puntambekar
 - Shimon Shtein
 - Tyler Gregory
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
@@ -201,7 +201,7 @@ homepage: https://github.com/theforeman/foreman_azure_rm
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Azure Resource Manager as a compute resource for The Foreman
 test_files: []