foreman_azure_rm 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416621db4c525470113b126a84a30a5701999e6bc442f6e18beb0bdd6b3379a3
-  data.tar.gz: 6ec1793bc3394b0a19f92f5ad98a33c005e30fce89bd549ebde954529ab7d895
+  metadata.gz: 03cab7177e77cb36e5e24755b2fadcd0b6934203001667ba89bd194b0d8d97a1
+  data.tar.gz: 2ddd6e70ddc620a1a859190f36b65fcd662241d8503b08bda0de606364a8a1df
 SHA512:
-  metadata.gz: f8a953836164727d9bba985be5d77b8211c73bc2cc20f45c7de563d49fb06cd32652695e6b4a0b42c19e0dcd5a5d86b51b347562b460f90eb33342f518044fd7
-  data.tar.gz: 79cbe567f0cb3556b046f208c6f7218876c4ab10fb8b74d4ae6e2d9df8a9f601b8a895cff46e236630c306f1f977a00c5976517af99c39744b6060a72b0cfda7
+  metadata.gz: fc7729cc420203fc3647557f5bdf13f0059a66613ef6e975062440ad75c3494f829c3ec8347470c49aebb35da50003bf8230a94529109debd6f5737d77d85d53
+  data.tar.gz: 42db1d9a7f3b210ac202d2c08fcb41fe8e7055c14a2e195facff44cc450dd34a61ef99f0ac8f8d2ea2b0efe676e676bb30cf5f879cf53f75f6643d219550eb15

data/app/helpers/azure_compute_resource_helper.rb

@@ -10,8 +10,7 @@ module AzureComputeResourceHelper
     end
     selectable_f(f, :url, regions, {}, {:label => _('Azure Region'), :disabled => regions.empty?, :required => true, :help_inline_permanent => load_button_f(f, regions.present?, _("Load Regions")) })
   end
-  def azure_doc_url
+  def azure_doc_version
     doc_version = Foreman::Plugin.find(:foreman_azure_rm).version.scan(/\d+\.\d+/).first + '.x'
-    "https://theforeman.org/plugins/foreman_azure/#{doc_version}"
   end
 end

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

@@ -4,7 +4,7 @@ module ForemanAzureRm
     module ManagedVM
       extend ActiveSupport::Concern
 
-      def define_managed_storage_profile(vm_name, os_disk_caching, platform, premium_os_disk)
+      def define_managed_storage_profile(vm_name, os_disk_caching, platform, premium_os_disk, os_disk_size_gb)
         storage_profile = ComputeModels::StorageProfile.new
         os_disk = ComputeModels::OSDisk.new
         managed_disk_params = ComputeModels::ManagedDiskParameters.new
@@ -12,6 +12,7 @@ module ForemanAzureRm
         # Create OS disk
         os_disk.name = "#{vm_name}-osdisk"
         os_disk.os_type = platform
+        os_disk.disk_size_gb = os_disk_size_gb
         os_disk.create_option = ComputeModels::DiskCreateOptionTypes::FromImage
         os_disk.caching = disk_caching(os_disk_caching)
         managed_disk_params.storage_account_type = if premium_os_disk == 'true'
@@ -187,21 +188,23 @@ module ForemanAzureRm
             os_profile.admin_password = vm_hash[:password]
 
             # Adding the ssh-key support for authentication
-            os_profile.linux_configuration = ComputeModels::LinuxConfiguration.new.tap do |linux|
-              linux.disable_password_authentication = vm_hash[:disable_password_authentication]
-              linux.ssh = ComputeModels::SshConfiguration.new.tap do |ssh_config|
-                ssh_config.public_keys = [
-                  ComputeModels::SshPublicKey.new.tap do |foreman_key|
-                    foreman_key.key_data = key_pair.public
-                    foreman_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+            if vm_hash[:platform] == 'Linux'
+              os_profile.linux_configuration = ComputeModels::LinuxConfiguration.new.tap do |linux|
+                linux.disable_password_authentication = vm_hash[:disable_password_authentication]
+                linux.ssh = ComputeModels::SshConfiguration.new.tap do |ssh_config|
+                  ssh_config.public_keys = [
+                    ComputeModels::SshPublicKey.new.tap do |foreman_key|
+                      foreman_key.key_data = key_pair.public
+                      foreman_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+                    end
+                  ]
+                  if vm_hash[:ssh_key_data].present?
+                    key_data = vm_hash[:ssh_key_data]
+                    pub_key = ComputeModels::SshPublicKey.new
+                    pub_key.key_data = key_data
+                    pub_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+                    ssh_config.public_keys << pub_key
                   end
-                ]
-                if vm_hash[:ssh_key_data].present?
-                  key_data = vm_hash[:ssh_key_data]
-                  pub_key = ComputeModels::SshPublicKey.new
-                  pub_key.key_data = key_data
-                  pub_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
-                  ssh_config.public_keys << pub_key
                 end
               end
             end
@@ -212,7 +215,8 @@ module ForemanAzureRm
                                                                 vm_hash[:name],
                                                                 vm_hash[:os_disk_caching],
                                                                 vm_hash[:platform],
-                                                                vm_hash[:premium_os_disk]
+                                                                vm_hash[:premium_os_disk],
+                                                                vm_hash[:os_disk_size_gb]
                                                               )
           vm.hardware_profile = ComputeModels::HardwareProfile.new.tap do |hw_profile|
             hw_profile.vm_size = vm_hash[:vm_size]
@@ -235,11 +239,22 @@ module ForemanAzureRm
         if args[:script_command].present? || args[:script_uris].present?
           args[:script_uris] ||=  args[:script_uris].to_s
           extension = ComputeModels::VirtualMachineExtension.new
-          if args[:platform] == 'Linux'
+
+          case args[:platform]
+          # https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-linux
+          when 'Linux'
             extension.publisher = 'Microsoft.Azure.Extensions'
             extension.virtual_machine_extension_type = 'CustomScript'
             extension.type_handler_version = '2.0'
+          # https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-windows
+          when 'Windows'
+            extension.publisher = 'Microsoft.Compute'
+            extension.virtual_machine_extension_type = 'CustomScriptExtension'
+            extension.type_handler_version = '1.10'
+          else
+            raise RuntimeError, "Unsupported platform #{args[:platform]}"
           end
+
           extension.auto_upgrade_minor_version = true
           extension.location = region
           extension.settings = {

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -115,7 +115,8 @@ module ForemanAzureRm
                              platform:        opts[:platform],
                              ssh_key_data:    opts[:ssh_key_data],
                              os_disk_caching: opts[:os_disk_caching],
-                             premium_os_disk: opts[:premium_os_disk]
+                             premium_os_disk: opts[:premium_os_disk],
+                             os_disk_size_gb: opts[:os_disk_size_gb]
                             )
       if opts[:interfaces].present?
         ifaces = []
@@ -268,23 +269,26 @@ module ForemanAzureRm
       args = args.to_h.deep_symbolize_keys
       args[:vm_name] = args[:name].split('.')[0]
       nics = create_nics(region, args)
-      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}\""
+
+      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
+          end
+          disable_password_auth = false
+        elsif args[:ssh_key_data].present? && !args[:password].present?
+          disable_password_auth = true
         else
-          args[:script_command] =  sudoers_cmd
+          disable_password_auth = false
         end
-        disable_password_auth = false
-      elsif args[:ssh_key_data].present? && !args[:password].present?
-        disable_password_auth = true
-      else
-        disable_password_auth = false
       end
 
       vm             = create_managed_virtual_machine(
@@ -301,6 +305,7 @@ module ForemanAzureRm
         image_id:                        args[:image_id],
         os_disk_caching:                 args[:os_disk_caching],
         premium_os_disk:                 args[:premium_os_disk],
+        os_disk_size_gb:                 args[:os_disk_size_gb],
         data_disks:                      args[:volumes_attributes],
         custom_data:                     args[:user_data],
         script_command:                  args[:script_command],

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -179,6 +179,10 @@ module ForemanAzureRm
       @azure_vm.storage_profile.os_disk.managed_disk.storage_account_type
     end
 
+    def os_disk_size_gb
+      @azure_vm.storage_profile.os_disk.disk_size_gb
+    end
+
     def os_disk_caching
       @azure_vm.storage_profile.os_disk.caching
     end

data/app/views/compute_resources/form/_azurerm.html.erb

@@ -4,8 +4,7 @@
   ['China', 'azurechina'],
   ['Germany', 'azuregermancloud'],
 ], {}, { :label => _('Cloud'), :required => true } %>
-<%= text_f f, :app_ident, :label => _('Client ID'), :required => true, :help_inline => link_to(icon_text('help', _('Documentation'), :kind => 'pficon'),
-  azure_doc_url, :rel => 'external', :class => 'btn btn-default btn-docs', :target => '_blank') %>
+<%= text_f f, :app_ident, :label => _('Client ID'), :required => true, :help_inline => link_to('Documentation', external_link_path(type: 'plugin_manual', name: 'foreman_azure', version: azure_doc_version), :kind => 'pficon', :rel => 'external', :class => 'btn btn-default btn-docs', :target => '_blank') %>
 <%= password_f f, :password, :label => _('Client Secret'), :keep_value => true, :required => true %>
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>

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

@@ -154,6 +154,16 @@
              'false'
 %>
 
+<%= number_f f, :os_disk_size_gb,
+         {
+             :label => _('Override OS Disk Size (GB)'),
+             :label_help => _("Leave empty to use default image size"),
+             :required => false,
+             :min => 1,
+             :class => "col-md-2",
+         }
+%>
+
 <%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
                {   :include_blank => _("Azure's Default") },
                {

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

metadata

@@ -1,101 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Aditi Puntambekar
 - Shimon Shtein
 - Tyler Gregory
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.9
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.9
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.4
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.4
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.3
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.3
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_subscriptions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.18.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -215,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
@@ -231,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Azure Resource Manager as a compute resource for The Foreman
 test_files: []