foreman_azure_rm 2.2.4 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29c728e81ac2e3c154212c1111ce0b0fa018ebfe33ae4e449c456c3a08013dca
-  data.tar.gz: fa67a435918ba3580f4fe0d74b493626d130b3a67d0eabf140de5103590afe09
+  metadata.gz: 17a61e0daa9ad81dba459c8976da8712fae9a1ff4b52aeb85c6a04f7aa9d5be8
+  data.tar.gz: e7469e41dcf4327afaf31de2b37be1f9119700419d6c22319df282e1e816451d
 SHA512:
-  metadata.gz: 305ea84bed5a5fff7313fc02febfbfff7407c9b0f7588670fef97065e8c78cb2d5e34b8932ee324b3052f06d97fd6455e8d2e5890c5f8322fc6530bd12f5905b
-  data.tar.gz: 07ed5bc2005637ba507ea057625794c082a40a19e083792b92de224318e9f477973a8c9df71cd6587af805b913a91c9f544f4527ffb5d883bcb1eac3d6701a2a
+  metadata.gz: 3cfe08678137c3c193362eec308091a1a7a45cc359e70590228be1a1022090b8041dac66ec5bc2a8adeab945615b45c0df5b9b2be73c6239aef73a21503eb7ce
+  data.tar.gz: 22d9c5ce4049fe7546dc48bdfdb382b61f5f7f3afa961ef328da2a92eb64bee4c3bbbfe3abae40eb80fcbdb183712d32b2e7b7e27f76d15bc785272c6d4d6cad

data/README.md

@@ -1,7 +1,7 @@
 # Foreman AzureRm Plugin
 
 ## Description
-```foreman_azure_rm``` adds [Microsoft Azure Resource Manager](http://azure.com/) as a compute resource for The Foreman
+```foreman_azure_rm``` adds [Microsoft Azure Resource Manager](http://azure.com/) as a Compute Resource for The Foreman
 
 * Website: [TheForeman.org](http://theforeman.org)
 * ForemanAzureRm: [Plugin manual](https://theforeman.org/plugins/foreman_azure)
@@ -11,7 +11,7 @@
 
 ### Bundle (Gem)
 
-Add the following to bundler.d/Gemfile.local.rb in your Foreman installation directory (/usr/share/foreman by default)
+Add the following to `bundler.d/Gemfile.local.rb` in your Foreman installation directory `/usr/share/foreman`
 
 ```console
 $ gem 'foreman_azure_rm'
@@ -55,7 +55,6 @@ Then run `bundle install` from the same directory
     * VM creation
     * Provisions using Finish and User data templates from Foreman
     * Supports cloud-config provisioning
-    * Currently supports only provisioning of Linux platforms
     * Provisioning using [Public Images](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage)
     * Provision using custom images
     * Provision using shared image galleries
@@ -64,6 +63,7 @@ Then run `bundle install` from the same directory
     * Support to add multiple data disks/volumes (standard or premium)
     * VM Extension with Custom Script and File URIs support
     * Static or dynamic addresses on a per NIC basis
+    * Support for NVIDIA Drivers or CUDA on Linux and Windows
 * Limited extension support
     * Microsoft's custom script extension
     * Puppet Lab's Puppet agent extension for Windows
@@ -74,16 +74,16 @@ Go to **Infrastructure > Compute Resources** and click on "New Compute Resource"
 
 Choose the **Azure Resource Manager provider**, and fill in all the fields. You need a Subscription ID, Tenant ID, Client ID and a Client Secret which you can generate from your [Microsoft Azure subscription](https://docs.bmc.com/docs/cloudlifecyclemanagement/46/setting-up-a-tenant-id-client-id-and-client-secret-for-azure-resource-manager-provisioning-669202145.html#SettingupaTenantID,ClientID,andClientSecretforAzureResourceManagerprovisioning-SetupTenantIDPrereqPrerequisites)
 
-That's it. You're now ready to create and manage Azure resources in your new Azure Resource Manager compute resource. You should see something like this in the Compute Resource page:
+That's it. You're now ready to create and manage Azure resources in your new Azure Resource Manager Compute Resource. You should see something like this in the Compute Resource page:
 
 
-![](https://i.imgur.com/vsamP4G.png)
+![](https://i.imgur.com/yMGg3A6.png)
 
 
 ![](https://i.imgur.com/Ag9tH55.png)
 
 
-![](https://i.imgur.com/fNjlFci.png)
+![](https://i.imgur.com/OKoGgUY.png)
 
     
 ## Planned Features

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

@@ -123,7 +123,7 @@ module ForemanAzureRm
       def create_nics(region, args = {})
         nics               = []
         args[:interfaces_attributes].each do |nic, attrs|
-          private_ip = Foreman::Cast.to_bool(attrs[:private_ip])
+          private_ip = ActiveRecord::Type::Boolean.new.deserialize(attrs[:private_ip])
           priv_ip_alloc       = if private_ip
                                   NetworkModels::IPAllocationMethod::Static
                                 else
@@ -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]
@@ -261,12 +269,43 @@ module ForemanAzureRm
                 'commandToExecute' => args[:script_command],
                 'fileUris'         => args[:script_uris].split(',')
           }
+
+          extension_for_log = "#{extension.publisher}/#{extension.virtual_machine_extension_type}/#{extension.type_handler_version}"
+          Foreman::Logging.logger('app').info "Azure RM machine #{args[:name]}: creating #{extension_for_log} extension"
           sdk.create_or_update_vm_extensions(args[:resource_group],
                                              args[:vm_name],
                                              'ForemanCustomScript',
                                              extension)
         end
       end
+
+      def create_vm_nvidia_gpu_extension(region, args = {})
+        extension = ComputeModels::VirtualMachineExtension.new
+        extension.publisher = 'Microsoft.HpcCompute'
+        extension.type_handler_version = '1.3'
+        extension.auto_upgrade_minor_version = true
+        extension.location = region
+
+        case args[:platform]
+        # https://docs.microsoft.com/fr-fr/azure/virtual-machines/extensions/hpccompute-gpu-linux
+        when 'Linux'
+          extension_name = 'NvidiaGpuDriverLinux'
+        # https://docs.microsoft.com/fr-fr/azure/virtual-machines/extensions/hpccompute-gpu-windows
+        when 'Windows'
+          extension_name = 'NvidiaGpuDriverWindows'
+        else
+          raise RuntimeError, "Unsupported platform #{args[:platform]}"
+        end
+        extension.virtual_machine_extension_type = extension_name
+
+        extension_for_log = "#{extension.publisher}/#{extension.virtual_machine_extension_type}/#{extension.type_handler_version}"
+        Foreman::Logging.logger('app').info "Azure RM machine #{args[:name]}: creating #{extension_for_log} extension"
+        sdk.create_or_update_vm_extensions(args[:resource_group],
+                                           args[:vm_name],
+                                           extension_name,
+                                           extension)
+      end
+
     end
   end
 end

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
@@ -116,7 +125,8 @@ module ForemanAzureRm
                              ssh_key_data:    opts[:ssh_key_data],
                              os_disk_caching: opts[:os_disk_caching],
                              premium_os_disk: opts[:premium_os_disk],
-                             os_disk_size_gb: opts[:os_disk_size_gb]
+                             os_disk_size_gb: opts[:os_disk_size_gb],
+                             nvidia_gpu_extension: opts[:nvidia_gpu_extension],
                             )
       if opts[:interfaces].present?
         ifaces = []
@@ -127,7 +137,16 @@ module ForemanAzureRm
 
       vols = opts.fetch(:volumes, []).map { |vols_attrs| new_volume(vols_attrs) } if opts[:volumes].present?
 
-      AzureRmCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces, volumes: vols, script_command: opts[:script_command], script_uris: opts[:script_uris])
+      AzureRmCompute.new(
+        azure_vm: raw_vm,
+        sdk: sdk,
+        resource_group: opts[:resource_group],
+        nics: ifaces,
+        volumes: vols,
+        script_command: opts[:script_command],
+        script_uris: opts[:script_uris],
+        nvidia_gpu_extension: ActiveRecord::Type::Boolean.new.deserialize(opts[:nvidia_gpu_extension]),
+      )
     end
 
     def provided_attributes
@@ -272,16 +291,10 @@ module ForemanAzureRm
 
       if args[:platform] == 'Linux'
         if args[:password].present? && !args[:ssh_key_data].present?
-          # Any change to sudoers_cmd and formation of new
-          # args[:script_command] must be accordingly changed
-          # in script_command method in AzureRmCompute class
-          sudoers_cmd = "$echo #{args[:password]} | sudo -S echo '\"#{args[:username]}\" ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/waagent"
           if args[:script_command].present?
             # to run the script_cmd given through form as username
             user_command = args[:script_command]
-            args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{user_command}\""
-          else
-            args[:script_command] =  sudoers_cmd
+            args[:script_command] = "su - \"#{args[:username]}\" -c \"#{user_command}\""
           end
           disable_password_auth = false
         elsif args[:ssh_key_data].present? && !args[:password].present?
@@ -310,11 +323,28 @@ module ForemanAzureRm
         custom_data:                     args[:user_data],
         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
+      if ActiveRecord::Type::Boolean.new.deserialize(args[:nvidia_gpu_extension])
+        create_vm_nvidia_gpu_extension(region, args)
+      end
+      # as this extension may contains postinstall script, call it after others
       create_vm_extension(region, args)
       # return the vm object using azure_vm
-      AzureRmCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm), volumes: vm_disks(vm), script_command: user_command, script_uris: args[:script_uris])
+      AzureRmCompute.new(
+        azure_vm: vm,
+        sdk: sdk,
+        resource_group: args[:resource_group],
+        nics: vm_nics(vm),
+        volumes: vm_disks(vm),
+        script_command: user_command,
+        script_uris: args[:script_uris],
+        nvidia_gpu_extension: ActiveRecord::Type::Boolean.new.deserialize(args[:nvidia_gpu_extension]),
+        tags: args[:tags],
+      )
     rescue RuntimeError => e
       Foreman::Logging.exception('Unhandled AzureRm error', e)
       destroy_vm vm.id if vm

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -5,7 +5,9 @@ module ForemanAzureRm
     attr_accessor :resource_group
     attr_accessor :nics
     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
 
@@ -15,7 +17,9 @@ module ForemanAzureRm
                    nics: [],
                    volumes: [],
                    script_command: nil,
-                   script_uris: nil)
+                   script_uris: nil,
+                   nvidia_gpu_extension: false,
+                   tags: [])
 
       @azure_vm = azure_vm
       @sdk = sdk
@@ -24,6 +28,8 @@ module ForemanAzureRm
       @volumes ||= volumes
       @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
@@ -208,8 +214,24 @@ module ForemanAzureRm
     def vm_extension
       return nil unless @azure_vm.resources
       @vm_extension ||= begin
-        ext_name = @azure_vm.resources.first.id.split('/')[-1]
-        sdk.get_vm_extension(@azure_vm.resource_group, name, ext_name)
+        @azure_vm.resources.each do |ext|
+          ext_name = ext.id.split('/')[-1]
+          next unless ext_name == 'ForemanCustomScript'
+          return sdk.get_vm_extension(@azure_vm.resource_group, name, ext_name)
+        end
+        nil
+      end
+    end
+
+    def vm_nvidia_gpu_extension
+      return nil unless @azure_vm.resources
+      @vm_nvidia_gpu_extension ||= begin
+        @azure_vm.resources.each do |ext|
+          ext_name = ext.id.split('/')[-1]
+          next unless ['NvidiaGpuDriverLinux', 'NvidiaGpuDriverWindows'].include? ext_name
+          return sdk.get_vm_extension(@azure_vm.resource_group, name, ext_name)
+        end
+        nil
       end
     end
 
@@ -219,7 +241,7 @@ module ForemanAzureRm
         # Index is based on script_command that is being injected
         # from the code in #create_vm. It can be partly hard-coded
         # since the command shall no change frequently.
-        if ssh_key_data.nil?
+        if ssh_key_data.nil? && platform == 'Linux'
           user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
           script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
         else
@@ -238,5 +260,14 @@ module ForemanAzureRm
         @script_uris
       end
     end
+
+    def nvidia_gpu_extension
+      if vm_nvidia_gpu_extension.present?
+        true
+      else
+        @nvidia_gpu_extension
+      end
+    end
+
   end
 end

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

@@ -185,6 +185,23 @@
          }
 %>
 
+<%= 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'),
+              :label_size => "col-md-2",
+              :label_help => _("Deploy NVIDIA GPU driver and CUDA (Azure Extension Microsoft.HpcCompute/NvidiaGpuDriver{Linux,Windows}/1.3)"),
+         },
+         'true',
+         'false'
+%>
+
 <div id="image_selection">
   <%= select_f f, :image_id, images, :uuid, :name,
                { :include_blank => (images.empty? or images.size == 1) ? false : _('Please select an image') },

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.2.7'.freeze
 end

data/locale/ca/foreman_azure_rm.po

@@ -22,6 +22,9 @@ msgstr ""
 msgid "%{vm_size} VM Size"
 msgstr ""
 
+msgid "Abstract async task"
+msgstr ""
+
 msgid "Action with sub plans"
 msgstr ""
 
@@ -31,6 +34,18 @@ msgstr "Accions"
 msgid "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation"
 msgstr ""
 
+msgid "Agent action"
+msgstr ""
+
+msgid "Attach subscriptions"
+msgstr ""
+
+msgid "Auto attach subscriptions"
+msgstr ""
+
+msgid "Azure Image Name"
+msgstr ""
+
 msgid "Azure Region"
 msgstr ""
 
@@ -46,6 +61,9 @@ msgstr ""
 msgid "Azure's default"
 msgstr ""
 
+msgid "Bulk generate applicability for hosts"
+msgstr ""
+
 msgid "Client ID"
 msgstr ""
 
@@ -58,9 +76,30 @@ msgstr ""
 msgid "Client Secret for AzureRm"
 msgstr ""
 
+msgid "Cloud"
+msgstr ""
+
+msgid "Combined Profile Update"
+msgstr ""
+
 msgid "Comma seperated file URIs"
 msgstr ""
 
+msgid "Copy version units to library"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Create Export History"
+msgstr ""
+
+msgid "Create Import History"
+msgstr ""
+
+msgid "Create Package Group"
+msgstr ""
+
 msgid "Custom Script Command"
 msgstr ""
 
@@ -70,25 +109,121 @@ msgstr ""
 msgid "Default ReadWrite"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
+msgid "Delete Activation Key"
+msgstr ""
+
+msgid "Delete Lifecycle Environment"
+msgstr ""
+
+msgid "Delete Package Group"
+msgstr ""
+
+msgid "Delete Product"
+msgstr ""
+
+msgid "Deploy NVIDIA GPU driver and CUDA (Azure Extension Microsoft.HpcCompute/NvidiaGpuDriver{Linux,Windows}/1.3)"
+msgstr ""
+
+msgid "Destroy"
+msgstr ""
+
+msgid "Destroy Content Host"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Discover"
+msgstr ""
+
 msgid "Does this image support user data input?"
 msgstr "La imatge admet l'entrada de dades d'usuari?"
 
+msgid "Enable"
+msgstr ""
+
+msgid "Errata mail"
+msgstr ""
+
+msgid "Export"
+msgstr ""
+
+msgid "Export Library"
+msgstr ""
+
+msgid "Fetch pxe files"
+msgstr ""
+
+msgid "Filtered index content"
+msgstr ""
+
+msgid "For custom or shared gallery image, use prefix 'custom://' or 'gallery://'. For public and RHEL-byos images, prefix the uuid with 'marketplace://'. (e.g. 'marketplace://OpenLogic:CentOS:7.5:latest' or 'custom://image-name')"
+msgstr ""
+
+msgid "Generate host applicability"
+msgstr ""
+
+msgid "Generate repository applicability"
+msgstr ""
+
+msgid "Hypervisors"
+msgstr ""
+
+msgid "Hypervisors update"
+msgstr ""
+
 msgid "Image"
 msgstr "Imatge"
 
+msgid "Import"
+msgstr ""
+
+msgid "Import Content View Version"
+msgstr ""
+
+msgid "Import Default Content View"
+msgstr ""
+
 msgid "Import Puppet classes"
 msgstr ""
 
 msgid "Import facts"
 msgstr ""
 
-msgid "Load Regions"
+msgid "Incremental Update"
+msgstr ""
+
+msgid "Incremental Update of  Content View Version(s) "
 msgstr ""
 
-msgid "Marketplace Image URN"
+msgid "Index content"
 msgstr ""
 
-msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgid "Index errata"
+msgstr ""
+
+msgid "Index module streams"
+msgstr ""
+
+msgid "Index package groups"
+msgstr ""
+
+msgid "Install Applicable Errata"
+msgstr ""
+
+msgid "Instance update"
+msgstr ""
+
+msgid "Leave empty to use default image size"
+msgstr ""
+
+msgid "Load Regions"
+msgstr ""
+
+msgid "NVIDIA driver / CUDA"
 msgstr ""
 
 msgid "Name"
@@ -97,6 +232,12 @@ msgstr "Nom"
 msgid "OS Disk Caching"
 msgstr ""
 
+msgid "Override OS Disk Size (GB)"
+msgstr ""
+
+msgid "Package Profile Update"
+msgstr ""
+
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -118,24 +259,66 @@ msgstr "Si us plau, seleccioneu una imatge"
 msgid "Premium OS Disk"
 msgstr ""
 
+msgid "Product Create"
+msgstr ""
+
+msgid "Promote"
+msgstr ""
+
+msgid "Promotion to Environment"
+msgstr ""
+
 msgid "Properties"
 msgstr "Propietats"
 
 msgid "Public IP"
 msgstr ""
 
+msgid "Publish"
+msgstr ""
+
+msgid "Publish Lifecycle Environment Repositories"
+msgstr ""
+
 msgid "Region"
 msgstr "Regió"
 
+msgid "Reindex subscriptions"
+msgstr ""
+
 msgid "Reload Images, Sizes, vNets"
 msgstr ""
 
 msgid "Remote action:"
 msgstr ""
 
+msgid "Remove Content"
+msgstr ""
+
+msgid "Remove Version"
+msgstr ""
+
+msgid "Remove Versions and Associations"
+msgstr ""
+
+msgid "Remove from Environment"
+msgstr ""
+
+msgid "Remove subscriptions"
+msgstr ""
+
+msgid "Report"
+msgstr ""
+
+msgid "Republish Version Repositories"
+msgstr ""
+
 msgid "Resource Group"
 msgstr ""
 
+msgid "Run Sync Plan:"
+msgstr ""
+
 msgid "SSH Key"
 msgstr ""
 
@@ -160,6 +343,15 @@ msgstr "ID de subscripció"
 msgid "Subscription ID for AzureRm"
 msgstr ""
 
+msgid "Sync capsule"
+msgstr ""
+
+msgid "Synchronize"
+msgstr ""
+
+msgid "Synchronize smart proxy"
+msgstr ""
+
 msgid "Tenant ID"
 msgstr ""
 
@@ -178,8 +370,44 @@ msgstr ""
 msgid "To perform commands as root, prefix it with 'sudo'"
 msgstr ""
 
+msgid "Update"
+msgstr ""
+
+msgid "Update Content Overrides"
+msgstr ""
+
+msgid "Update content urls"
+msgstr ""
+
+msgid "Update for host"
+msgstr ""
+
+msgid "Update http proxy"
+msgstr ""
+
+msgid "Update http proxy details"
+msgstr ""
+
+msgid "Update redhat repository"
+msgstr ""
+
+msgid "Update release version for host"
+msgstr ""
+
+msgid "Updating System Purpose for host"
+msgstr ""
+
+msgid "Upload errata into"
+msgstr ""
+
+msgid "Upload into"
+msgstr ""
+
 msgid "Username"
 msgstr "Nom d'usuari"
 
 msgid "VM Size"
 msgstr ""
+
+msgid "Verify checksum"
+msgstr ""