foreman_bootdisk 19.0.2 → 19.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288a501e1dc3e32cc0d29175e498c1f6f3c04869e51ab755b8d4c69c1aa68ef2
-  data.tar.gz: 9180766afc55ffa712ac164688c02fe6edcf322f23c6b3f1e8dafae1e7295c4c
+  metadata.gz: c50d87e902b43ec4b94df5845e8f5f660663e9d9220285401e223e2e2cdf3624
+  data.tar.gz: 3b1092081bda0337d725ecb66ce3e2acd2ffbf2e32fd179e34f11ee3bc137b28
 SHA512:
-  metadata.gz: 73ab12281dc578414885ab788023b80f499cb075d53c365597561d1f7c02b32cbd31234ed4cd4e73ae81a23309e2c723f603b5a7d139fed5a8dd53aca52aee0b
-  data.tar.gz: 7e2eae93d56bc434ca4a7a845a05ff909f6b116e137b6525463acace00a9671fa4600043cbae86f92a10441031e975525dac3381cadbfb536539ce4898839a9a
+  metadata.gz: eaa41fe654e374bc71a02a8fd30b5b74cb50e15cded72af4375e4df943dd890f086abe973a376dc84bb5f307bd8e1c62bb5f27505176ff5299229110434b1760
+  data.tar.gz: 978d4631aa89857baf2a8b1e26fd19917e5118fb482f03ddfe7a3ac5b52ed78f71f85142a2d3a8a0b17eb4aebbda2e6f9b081e6fe8075c6490c32f85a4d3cd68

data/app/lib/foreman_bootdisk/scope/bootdisk.rb

@@ -14,8 +14,8 @@ module ForemanBootdisk
         optional :mac, String, 'MAC address of the host', default: 'MAC address of the current host'
         optional :action, String, 'Bootloader to use', default: 'iPXE'
         returns String, desc: 'URL for boot chain'
-        example 'bootdisk_chain_url #=> "http://foreman.some.host.fqdn/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55"'
-        example 'bootdisk_chain_url("00:11:22:33:44:55") #=> "http://foreman.some.host.fqdn/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55"'
+        example 'bootdisk_chain_url #=> "http://foreman.example.com/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55"'
+        example 'bootdisk_chain_url("00:11:22:33:44:55") #=> "http://foreman.example.com/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55"'
       end
       def bootdisk_chain_url(mac = host.try(:mac), action = 'iPXE')
         url = foreman_url(action)

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -24,7 +24,7 @@ module ForemanBootdisk
     end
 
     def bootdisk?
-      managed? && bootdisk_build? && SETTINGS[:unattended]
+      managed? && bootdisk_build?
     end
 
     def bootdisk_downloadable?
@@ -36,7 +36,7 @@ module ForemanBootdisk
     end
 
     def can_be_built?
-      super || (managed? && SETTINGS[:unattended] && bootdisk_build? && !build?)
+      super || (managed? && bootdisk_build? && !build?)
     end
 
     apipie_update :class do

data/app/models/setting/bootdisk.rb

@@ -1,31 +1,7 @@
 # frozen_string_literal: true
 
 class Setting
-  class Bootdisk < ::Setting
-    def self.default_settings
-      ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
-      isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-      syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-      grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
-      templates = -> { Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }] }
-
-      [
-        set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe, N_('iPXE directory')),
-        set('bootdisk_isolinux_dir', N_('Path to directory containing isolinux images'), isolinux, N_('ISOLINUX directory')),
-        set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux, N_('SYSLINUX directory')),
-        set('bootdisk_grub2_dir', N_('Path to directory containing grubx64.efi and shimx64.efi'), grub2, N_('Grub2 directory')),
-        set('bootdisk_host_template', N_('iPXE template to use for host-specific boot disks'),
-            'Boot disk iPXE - host', N_('Host image template'), nil, collection: templates),
-        set('bootdisk_generic_host_template', N_('iPXE template to use for generic host boot disks'),
-            'Boot disk iPXE - generic host', N_('Generic image template'), nil, collection: templates),
-        set('bootdisk_generic_efi_host_template', N_('Grub2 template to use for generic EFI host boot disks'),
-            'Boot disk Grub2 EFI - generic host', N_('Generic Grub2 EFI image template'), nil, collection: templates),
-        set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage', N_('ISO generation command')),
-        set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true, N_('Installation media caching')),
-        set('bootdisk_allowed_types', N_('List of allowed bootdisk types, remove type to disable it'), Setting::Bootdisk.bootdisk_types, N_('Allowed bootdisk types'))
-      ]
-    end
-
+  class Bootdisk
     def self.humanized_category
       N_('Boot disk')
     end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -170,8 +170,7 @@ module ForemanBootdisk
       # Also we cannot rely on systemd-tmpfiles-clean as private temporary files are not subject
       # of scheduled cleanups. Let's clean bootdisks from prevous requests manually by finding
       # and deleting all directories created 30 minutes ago.
-      delete_older_than = Time.now.to_i - (60 * 30)
-      Rails.root.glob('tmp/bootdisk-iso-*').select { |f| File.ctime(f) < delete_older_than }.each { |f| FileUtils.rm_f(f) }
+      Rails.root.glob('tmp/bootdisk-iso-*').select { |f| File.ctime(f) < (Time.now.getlocal - 30.minutes) }.each { |f| FileUtils.rm_rf(f) }
     end
 
     def self.build_mkiso_command(output_file:, source_directory:, extra_commands:)

data/app/views/foreman_bootdisk/generic_efi_host.erb

@@ -1,3 +1,11 @@
+<%#
+name: Boot disk Grub2 EFI - generic host
+snippet: false
+model: ProvisioningTemplate
+kind: Bootdisk
+description: |
+  Boot disk Grub2 EFI - generic host
+-%>
 #
 # Boot disk Grub2 EFI - generic host
 #

data/app/views/foreman_bootdisk/generic_host.erb

@@ -1,13 +1,18 @@
+<%#
+name: Boot disk iPXE - generic host
+snippet: false
+model: ProvisioningTemplate
+kind: Bootdisk
+description: |
+  Example foreman_bootdisk generic host template
+ 
+  This template is generic, but it will chainload to Foreman so expects the
+  host to be registered already.
+ 
+  It loops through all interfaces using DHCP, requesting a template from
+  Foreman in the hope that one of the MACs or IPs matches.
+-%>
 #!ipxe
-# Example foreman_bootdisk generic host template
-#
-# This template is generic, but it will chainload to Foreman so expects the
-# host to be registered already.
-#
-# It loops through all interfaces using DHCP, requesting a template from
-# Foreman in the hope that one of the MACs or IPs matches.
-#
-# Copy this template to customize it, the original is read-only.
 
 echo Foreman Bootdisk: Generic image
 

data/app/views/foreman_bootdisk/generic_static_host.erb

@@ -1,8 +1,13 @@
+<%#
+name: Boot disk iPXE - generic static host
+snippet: false
+model: ProvisioningTemplate
+kind: Bootdisk
+description: |
+  Generic host template with interactive static IP configuration. Tokens
+  must be disabled in order to access templates via MAC addresses.
+-%>
 #!ipxe
-#
-# Generic host template with interactive static IP configuration. Tokens
-# must be disabled in order to access templates via MAC addresses.
-#
 
 <% (0..32).each do |i| -%>
 :net<%= i %>

data/app/views/foreman_bootdisk/host.erb

@@ -1,8 +1,13 @@
+<%#
+name: Boot disk iPXE - host
+snippet: false
+model: ProvisioningTemplate
+kind: Bootdisk
+description: |
+  Example foreman_bootdisk host template
+  This template is rendered for use inside a host-specific boot disk.
+-%>
 #!ipxe
-# Example foreman_bootdisk host template
-# This template is rendered for use inside a host-specific boot disk.
-#
-# Copy this template to customize it, the original is read-only.
 
 <%
 interface = @host.provision_interface

data/db/migrate/20140522185700_change_templatekind_to_bootdisk.rb

@@ -7,6 +7,7 @@ class ChangeTemplatekindToBootdisk < ActiveRecord::Migration[4.2]
                       else
                         'templates'
                       end
+    self.inheritance_column = :_type_disabled
   end
 
   def self.up
@@ -15,10 +16,8 @@ class ChangeTemplatekindToBootdisk < ActiveRecord::Migration[4.2]
     tmpl_h = Setting.find_by(name: 'bootdisk_host_template').try(:value)
     tmpl_g = Setting.find_by(name: 'bootdisk_generic_host_template').try(:value)
 
-    (FakeConfigTemplate.unscoped.where('name LIKE ?', '%Boot disk%') |
-      FakeConfigTemplate.unscoped.where(name: [tmpl_h, tmpl_g].compact)).each do |tmpl|
-      tmpl.update_attribute(:template_kind_id, kind.id)
-    end
+    FakeConfigTemplate.unscoped.where('name LIKE ?', '%Boot disk%').update_all(template_kind_id: kind.id)
+    FakeConfigTemplate.unscoped.where(name: [tmpl_h, tmpl_g].compact).update_all(template_kind_id: kind.id)
   end
 
   def self.down

data/lib/foreman_bootdisk/engine.rb

@@ -17,15 +17,6 @@ module ForemanBootdisk
       app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
     end
 
-    initializer 'foreman_bootdisk.load_default_settings', before: :load_config_initializers do |_app|
-      table_exists = begin
-                       Setting.table_exists?
-                     rescue StandardError
-                       false
-                     end
-      require_dependency File.expand_path('../../app/models/setting/bootdisk.rb', __dir__) if table_exists
-    end
-
     initializer 'foreman_bootdisk.load_app_instance_data' do |app|
       ForemanBootdisk::Engine.paths['db/migrate'].existent.each do |path|
         app.config.paths['db/migrate'] << path
@@ -38,7 +29,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 3.1'
+        requires_foreman '>= 3.3'
         # Add Global files for extending foreman-core components and routes
         register_global_js_file 'global'
 
@@ -50,7 +41,6 @@ module ForemanBootdisk
         end
 
         role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
-
         add_all_permissions_to_default_roles
 
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
@@ -65,6 +55,81 @@ module ForemanBootdisk
           cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
           cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
         end
+
+        settings do
+          category :bootdisk, N_("Boot disk") do
+            ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
+            isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
+            syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
+            grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
+            templates = -> {
+              Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }]
+            }
+
+            setting "bootdisk_ipxe_dir",
+              type: :string,
+              default: ipxe,
+              full_name: N_("iPXE directory"),
+              description: N_("Path to directory containing iPXE images")
+
+            setting "bootdisk_isolinux_dir",
+              type: :string,
+              default: isolinux,
+              full_name: N_("ISOLINUX directory"),
+              description: N_("Path to directory containing isolinux images")
+
+            setting "bootdisk_syslinux_dir",
+              type: :string,
+              default: syslinux,
+              full_name: N_("SYSLINUX directory"),
+              description: N_("Path to directory containing syslinux images")
+
+            setting "bootdisk_grub2_dir",
+              type: :string,
+              default: grub2,
+              full_name: N_("Grub2 directory"),
+              description: N_("Path to directory containing grubx64.efi and shimx64.efi")
+
+            setting "bootdisk_host_template",
+              type: :string,
+              collection: templates,
+              default: "Boot disk iPXE - host",
+              full_name: N_("Host image template"),
+              description: N_("iPXE template to use for host-specific boot disks")
+
+            setting "bootdisk_generic_host_template",
+              type: :string,
+              collection: templates,
+              default: "Boot disk iPXE - generic host",
+              full_name: N_("Generic image template"),
+              description: N_("iPXE template to use for generic host boot disks")
+
+            setting "bootdisk_generic_efi_host_template",
+              type: :string,
+              collection: templates,
+              default: "Boot disk Grub2 EFI - generic host",
+              full_name: N_("Generic Grub2 EFI image template"),
+              description: N_("iPXE template to use for generic EFI host boot disks")
+
+            setting "bootdisk_mkiso_command",
+              type: :string,
+              default: "genisoimage",
+              full_name: N_("ISO generation command"),
+              description: N_("Command to generate ISO image, use genisoimage or mkisofs")
+
+            setting "bootdisk_cache_media",
+              type: :boolean,
+              default: true,
+              full_name: N_("Installation media caching"),
+              description: N_("Installation media files will be cached for full host images")
+
+            setting "bootdisk_allowed_types",
+              type: :string,
+              default: Setting::Bootdisk.bootdisk_types,
+              full_name: N_("Allowed bootdisk types"),
+              description: N_("List of allowed bootdisk types, remove type to disable it")
+          end
+        end
       end
     end
 
@@ -77,7 +142,7 @@ module ForemanBootdisk
     config.to_prepare do
       begin
         Host::Managed.prepend ForemanBootdisk::HostExt
-        Host::Managed.include ForemanBootdisk::Orchestration::Compute if SETTINGS[:unattended]
+        Host::Managed.include ForemanBootdisk::Orchestration::Compute
         HostsHelper.prepend ForemanBootdisk::HostsHelperExt
         SubnetsHelper.prepend ForemanBootdisk::SubnetsHelperExt
         Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?

data/lib/foreman_bootdisk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanBootdisk
-  VERSION = '19.0.2'
+  VERSION = '19.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 19.0.2
+  version: 19.0.5
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -96,64 +96,36 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ca/foreman_bootdisk.edit.po
 - locale/ca/foreman_bootdisk.po
-- locale/ca/foreman_bootdisk.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_bootdisk.mo
-- locale/de/foreman_bootdisk.edit.po
 - locale/de/foreman_bootdisk.po
-- locale/de/foreman_bootdisk.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en/foreman_bootdisk.edit.po
 - locale/en/foreman_bootdisk.po
-- locale/en/foreman_bootdisk.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en_GB/foreman_bootdisk.edit.po
 - locale/en_GB/foreman_bootdisk.po
-- locale/en_GB/foreman_bootdisk.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_bootdisk.mo
-- locale/es/foreman_bootdisk.edit.po
 - locale/es/foreman_bootdisk.po
-- locale/es/foreman_bootdisk.po.time_stamp
 - locale/foreman_bootdisk.pot
 - locale/fr/LC_MESSAGES/foreman_bootdisk.mo
-- locale/fr/foreman_bootdisk.edit.po
 - locale/fr/foreman_bootdisk.po
-- locale/fr/foreman_bootdisk.po.time_stamp
 - locale/gemspec.rb
 - locale/it/LC_MESSAGES/foreman_bootdisk.mo
-- locale/it/foreman_bootdisk.edit.po
 - locale/it/foreman_bootdisk.po
-- locale/it/foreman_bootdisk.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ja/foreman_bootdisk.edit.po
 - locale/ja/foreman_bootdisk.po
-- locale/ja/foreman_bootdisk.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ko/foreman_bootdisk.edit.po
 - locale/ko/foreman_bootdisk.po
-- locale/ko/foreman_bootdisk.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_bootdisk.mo
-- locale/pt_BR/foreman_bootdisk.edit.po
 - locale/pt_BR/foreman_bootdisk.po
-- locale/pt_BR/foreman_bootdisk.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ru/foreman_bootdisk.edit.po
 - locale/ru/foreman_bootdisk.po
-- locale/ru/foreman_bootdisk.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_bootdisk.mo
-- locale/sv_SE/foreman_bootdisk.edit.po
 - locale/sv_SE/foreman_bootdisk.po
-- locale/sv_SE/foreman_bootdisk.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_CN/foreman_bootdisk.edit.po
 - locale/zh_CN/foreman_bootdisk.po
-- locale/zh_CN/foreman_bootdisk.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_TW/foreman_bootdisk.edit.po
 - locale/zh_TW/foreman_bootdisk.po
-- locale/zh_TW/foreman_bootdisk.po.time_stamp
 - package.json
 - webpack/__mocks__/foremanReact/common/HOC.js
 - webpack/__mocks__/foremanReact/common/I18n.js