foreman_bootdisk 19.0.6 → 21.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e45f52942dcc02997951e5994c28cf2225e2a7843b4c7f7df5105ea6298ad8b
-  data.tar.gz: a6cdb77d4f5bf6ff0e4cbb425a054ea9dd0f4cb21cb2e44b68919b5886c700c9
+  metadata.gz: 66231c8d3a35aa4ebbbe3ef624a629c309d74ea4d95a39a009b1b07b60f9ce3f
+  data.tar.gz: 350ccaf1150dd3bfb2e6db920706f6f077783619b2a455f21b9f644a38bda4ca
 SHA512:
-  metadata.gz: fff8a878907faca8d28fb33026879db8d94be2c2fb8655dedc84447cc0210a053e29115bbbe95da8126b62256028e07c11aa5f44b821eb4f2091304b125b768a
-  data.tar.gz: 5cf6cdd0fff635f0c88500bd5489cc5402de8ef899637dfd9915da42780ecb8690209b735663df074aa0826edc31c77238ea54268e67c106e4d6b16b0764c943
+  metadata.gz: '082d9c32af3239beec631cccaf7ff418ce42b74dee910be2fa4ae28cb44fc94193a7d2c6ee3365611823e115f20ac4a311aa196eee3cf98beb4066c116fb2406'
+  data.tar.gz: 8fb0981f8d0cd18d4b40aa7592f15d5f3be3f9acf7c71962491160e4d92527f747ccbb4dbb190c1c4d3b2a70142a1e4e857bae5b47eec321916af644dbc11f7a

data/app/controllers/foreman_bootdisk/api/v2/disks_controller.rb

@@ -9,10 +9,6 @@ module ForemanBootdisk
         include ::Api::Version2
         include AllowedActions
 
-        resource_description do
-          api_base_url '/bootdisk/api'
-        end
-
         before_action :bootdisk_type_allowed?, only: :generic
         before_action :find_resource, only: :host
         skip_after_action :log_response_body

data/app/controllers/foreman_bootdisk/api/v2/subnet_disks_controller.rb

@@ -9,10 +9,6 @@ module ForemanBootdisk
         include ::Api::Version2
         include AllowedActions
 
-        resource_description do
-          api_base_url '/bootdisk/api'
-        end
-
         rescue_from ActiveRecord::RecordNotFound, :with => :subnet_not_found
         before_action :bootdisk_type_allowed?, only: :subnet
         before_action :find_resource, only: :subnet

data/app/controllers/foreman_bootdisk/disks_controller.rb

@@ -121,16 +121,18 @@ module ForemanBootdisk
         disable_full_host = action == 'full_host' && !host.build?
         actions << {
           title: title,
-          link: "/bootdisk/disks/#{action}s/#{host.id}",
+          link: "/disks/#{action}s/#{host.id}",
           disabled:  disable_full_host ? true : false,
-          description: disable_full_host ? _('Host is not in build mode') : nil
+          description: disable_full_host ? _('Host is not in build mode') : nil,
+          icon: action,
         }
       end
       return allowed unless User.current.allowed_to?({controller: 'foreman_bootdisk/disks', action: 'help'})
 
       allowed.push({
         title: _('Boot disk help'),
-        link: '/bootdisk/disks/help'
+        link: '/disks/help',
+        icon: 'help'
       })
     end
   end

data/config/routes/mount_engine.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Foreman::Application.routes.draw do
-  mount ForemanBootdisk::Engine, at: '/bootdisk'
+  mount ForemanBootdisk::Engine, at: '/'
 end

data/db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FixBootdiskSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::Bootdisk').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_bootdisk/engine.rb

@@ -6,6 +6,7 @@ require 'gettext_i18n_rails'
 
 module ForemanBootdisk
   class Engine < ::Rails::Engine
+    engine_name 'foreman_bootdisk'
     isolate_namespace ForemanBootdisk
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
@@ -29,7 +30,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 3.3'
+        requires_foreman '>= 3.4'
         # Add Global files for extending foreman-core components and routes
         register_global_js_file 'global'
 
@@ -48,7 +49,6 @@ module ForemanBootdisk
           "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
         ]
         provision_method 'bootdisk', N_('Boot disk based')
-        template_labels 'Bootdisk' => N_('Boot disk embedded template')
         allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
 
         extend_page "subnets/index" do |cx|
@@ -139,12 +139,16 @@ module ForemanBootdisk
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
+    # Temporary workaround fix for helpers
+    initializer 'foreman_bootdisk.rails_loading_workaround' do
+      HostsHelper.prepend ForemanBootdisk::HostsHelperExt
+      SubnetsHelper.prepend ForemanBootdisk::SubnetsHelperExt
+    end
+
     config.to_prepare do
       begin
         Host::Managed.prepend ForemanBootdisk::HostExt
         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?
       rescue StandardError => e
         Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"

data/lib/foreman_bootdisk/version.rb

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

data/package.json

@@ -26,12 +26,11 @@
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@sheerun/mutationobserver-shim": "^0.3.3",
-    "@theforeman/builder": "^8.15.0",
-    "@theforeman/eslint-plugin-foreman": "8.15.0",
-    "@theforeman/find-foreman": "^8.15.0",
-    "@theforeman/stories": "^8.15.0",
-    "@theforeman/test": "^8.15.0",
-    "@theforeman/vendor-dev": "^8.15.0",
+    "@theforeman/builder": ">= 8.15.0",
+    "@theforeman/eslint-plugin-foreman": ">= 8.15.0",
+    "@theforeman/find-foreman": ">= 8.15.0",
+    "@theforeman/stories": ">= 8.15.0",
+    "@theforeman/test": ">= 8.15.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",

data/webpack/src/extensions/host/HostBootdiskButtons.js

@@ -2,6 +2,12 @@ import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
 import { DropdownItem, DropdownGroup } from '@patternfly/react-core';
+import {
+  BanIcon,
+  BuildIcon,
+  BuilderImageIcon,
+  OutlinedQuestionCircleIcon,
+} from '@patternfly/react-icons';
 
 import { get } from 'foremanReact/redux/API';
 import { foremanUrl } from 'foremanReact/common/helpers';
@@ -23,11 +29,24 @@ const HostBootdiskButtons = () => {
   const isLoading = useSelector(selectIsLoading);
   const options = useSelector(selectBootdiskOptions);
 
+  const iconComponent = icon => {
+    switch (icon) {
+      case 'host':
+        return <BuildIcon />;
+      case 'full_host':
+        return <BuilderImageIcon />;
+      case 'help':
+        return <OutlinedQuestionCircleIcon />;
+      default:
+        return null;
+    }
+  };
+
   useEffect(() => {
     dispatch(
       get({
         key: HOST_BOOTDISK_BUTTONS_REQUEST_KEY,
-        url: foremanUrl(`/bootdisk/disks/bootdisk_options/${hostId}`),
+        url: foremanUrl(`/disks/bootdisk_options/${hostId}`),
       })
     );
   }, [dispatch, hostId]);
@@ -40,6 +59,7 @@ const HostBootdiskButtons = () => {
         href={foremanUrl(action.link)}
         isDisabled={action.disabled}
         description={action.description}
+        icon={iconComponent(action.icon)}
       >
         {action.title}
       </DropdownItem>
@@ -55,6 +75,7 @@ const HostBootdiskButtons = () => {
           options.architectureName
         )}
         tooltipProps={{ entryDelay: 0, exitDelay: 0 }}
+        icon={<BanIcon />}
       >
         {__('Not available')}
       </DropdownItem>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 19.0.6
+  version: 21.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -72,10 +72,6 @@ files:
 - app/services/foreman_bootdisk/iso_generator.rb
 - app/services/foreman_bootdisk/renderer.rb
 - app/views/foreman_bootdisk/disks/help.html.erb
-- app/views/foreman_bootdisk/generic_efi_host.erb
-- app/views/foreman_bootdisk/generic_host.erb
-- app/views/foreman_bootdisk/generic_static_host.erb
-- app/views/foreman_bootdisk/host.erb
 - app/views/hosts/provision_method/bootdisk/_form.html.erb
 - app/views/subnets/_bootdisk_action_buttons.erb
 - app/views/subnets/_bootdisk_title_buttons.erb
@@ -88,7 +84,7 @@ files:
 - db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb
 - db/migrate/20140522185700_change_templatekind_to_bootdisk.rb
 - db/migrate/20171009225200_remove_duplicate_bootdisk_templates.rb
-- db/seeds.d/50-bootdisk_templates.rb
+- db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb
 - lib/foreman_bootdisk.rb
 - lib/foreman_bootdisk/engine.rb
 - lib/foreman_bootdisk/version.rb

data/app/views/foreman_bootdisk/generic_efi_host.erb

@@ -1,76 +0,0 @@
-<%#
-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
-#
-#set debug="http,efinet,net"
-#set debug=all
-echo "Foreman Bootdisk: 'Boot disk Grub2 EFI - generic host' template"
-echo
-echo "********************************************************"
-echo " REQUIREMENTS:"
-echo " * SUBNET GENERIC IMAGE ONLY (host image not supported)"
-echo " * HOST PARAM default_grub_install_entry set to efi_http"
-echo " * PROXY WITH HTTPBOOT FEATURE"
-echo " * HTTP UEFI BOOT ONLY (Legacy/PXE not supported)"
-echo " * IPv4 ONLY (IPv6 not tested, change the template)"
-echo " * HTTP ONLY (change the template for HTTPS)"
-echo " * ISC DHCP (other servers not tested)"
-echo " * GRUB FROM RHEL 8.3+/7.9+ (when generating the image)"
-echo " * EFI HTTP or HTTPS grub entry must be selected in menu"
-echo " * DNS must resolve proxy hostname via DNS proxy if set"
-echo "*******************************************************"
-sleep 5
-<%
-# possible values are: "http" or "https"
-proxy_proto = "http"
-
-@subnet || bootdisk_raise("Generic disk not supported for EFI, use subnet disk")
-@subnet.template? || bootdisk_raise("Requires a proxy with template feature")
-proxy_port = if proxy_proto == "http"
-  @subnet.httpboot.httpboot_http_port
-else
-  @subnet.httpboot.httpboot_https_port
-end
-# Workaround for "no DNS server configured" https://bugzilla.redhat.com/show_bug.cgi?id=1842509
-proxy_httpboot_host = dns_lookup(@subnet.httpboot.hostname)
-proxy_template_host = dns_lookup(@subnet.template.hostname)
--%>
-echo
-net_ls_cards
-echo "Configuring ALL cards via BOOTP/IPv4"
-net_bootp
-# uncomment here for IPv6 support (not tested)
-#echo "Configuring ALL cards via BOOTP/IPv6"
-#net_ipv6_autoconf
-net_ls_addr
-net_ls_routes
-net_ls_dns
-echo Trying to ping proxy_httpboot_host: <%= proxy_httpboot_host %>
-ping --count 1 <%= proxy_httpboot_host %> || echo Ping to proxy_httpboot_host failed or ping command not available.
-echo Trying to ping proxy_template_host: <%= proxy_template_host %>
-ping --count 1 <%= proxy_template_host %> || echo Ping to proxy_template_host failed or ping command not available.
-sleep 5
-set root=(<%= proxy_proto %>,<%= proxy_httpboot_host %>:<%= proxy_port %>)
-# The variable will not survive configfile fetch, therefore absolute path
-# must be used in the chainloaded template.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1842893
-set http_path=/httpboot/
-set default=efi_<%= proxy_proto %>
-<% (0..32).each do |i| -%>
-  echo "Trying efinet<%= i %> via <%= proxy_proto %>://<%= proxy_template_host %>:<%= proxy_port %>/unattended/PXEGrub2?mac=$net_efinet<%= i %>_dhcp_mac"
-  set net_default_mac=$net_efinet<%= i %>_dhcp_mac
-  sleep 5
-  configfile (<%= proxy_proto %>,<%= proxy_template_host %>:<%= proxy_port %>)/unattended/PXEGrub2?mac=$net_efinet<%= i %>_dhcp_mac
-<% end -%>
-
-echo "Could not find a host with PXEGrub2 template and one of the MAC addresses!"
-echo "The system will poweroff in few minutes..."
-sleep 500
-poweroff

data/app/views/foreman_bootdisk/generic_host.erb

@@ -1,51 +0,0 @@
-<%#
-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
-
-echo Foreman Bootdisk: Generic image
-
-# loop over net* until we can get a template
-<% url = bootdisk_chain_url %>
-<% (0..32).each do |i| -%>
-:net<%= i %>
-isset ${net<%= i -%>/mac} || goto no_nic
-echo net<%= i -%> is a ${net<%= i -%>/chip} with MAC ${net<%= i -%>/mac}
-dhcp net<%= i %> || goto net<%= i+1 %>
-chain <%= url %>${net<%= i -%>/mac} || goto net<%= i+1 %>
-exit 0
-<% end -%>
-echo Failed to chainload from any network interface, fallback to static.
-ifstat
-
-:no_nic
-echo -n Enter interface name to boot from (e.g. net0):  && read interface
-isset ${${interface}/mac} && goto get_static_ip
-echo Interface ${interface} is not initialized, try again
-goto no_nic
-
-:get_static_ip
-ifopen ${interface}
-echo Please enter IP details for ${interface}
-echo
-echo -n IP address      :  && read ${interface}/ip
-echo -n Subnet mask     :  && read ${interface}/netmask
-echo -n Default gateway :  && read ${interface}/gateway
-echo -n DNS server      :  && read dns
-chain <%= url %>${${interface}/mac} || goto boot_failure
-exit 0
-
-:boot_failure
-echo Cannot continue, spawning shell
-shell

data/app/views/foreman_bootdisk/generic_static_host.erb

@@ -1,39 +0,0 @@
-<%#
-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
-
-<% (0..32).each do |i| -%>
-:net<%= i %>
-isset ${net<%= i -%>/mac} || goto configure
-echo Found ${net<%= i -%>/mac} as net<%= i -%> on a ${net<%= i -%>/chip}
-goto net<%= i+1 %>
-<% end -%>
-
-:configure
-echo -n Interface (e.g. net0): && read interface
-iseq ${interface} n && goto reboot ||
-iseq ${interface} N && goto reboot ||
-
-ifopen ${interface}
-echo Please enter IPv4 details for ${interface}
-echo
-
-echo -n IP address:  && read ${interface}/ip
-echo -n Subnet mask:  && read ${interface}/netmask
-echo -n Default gateway:  && read ${interface}/gateway
-echo -n DNS server:  && read dns
-
-chain <%= bootdisk_chain_url %>${${interface}/mac} || goto reboot
-exit 0
-
-:reboot
-echo Unable to continue, rebooting...
-sleep 30
-exit 1

data/app/views/foreman_bootdisk/host.erb

@@ -1,80 +0,0 @@
-<%#
-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
-
-<%
-interface = @host.provision_interface
-bootdisk_raise(N_('Host has no provisioning interface defined')) unless interface
-bootdisk_raise(N_('Host has no IPv4 or IPv6 address defined')) unless interface.ip.present? || interface.ip6.present?
-bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet || interface.subnet6
-bootdisk_raise(N_('Host has no domain defined')) unless interface.domain
-if interface.ip.present? && interface.subnet
-  ip = interface.ip
-  subnet = interface.subnet
-elsif interface.ip6.present? && interface.subnet6
-  ip = interface.ip6
-  subnet = interface.subnet6
-  bootdisk_raise(N_('Host bootdisk does not work with static IPv6'))
-else
-  bootdisk_raise(N_('Both IP and Subnet must be set'))
-end
-
-mask = subnet.mask
-gw = subnet.gateway
-dns = subnet.dns_servers.first
-%>
-
-echo Foreman Bootdisk: Host image (<%= @host.name %>)
-
-# loop over net* until the host's MAC matches
-<% (0..32).each do |i| -%>
-:net<%= i %>
-isset ${net<%= i -%>/mac} || goto no_nic
-echo net<%= i -%> is a ${net<%= i -%>/chip} with MAC ${net<%= i -%>/mac}
-iseq ${net<%= i -%>/mac} <%= interface.mac -%> || goto net<%= i+1 %>
-set idx:int32 <%= i %>
-goto loop_success
-<% end -%>
-
-:loop_success
-echo Configuring net${idx} for static IP address <%= ip %>
-ifopen net${idx}
-# netX = last opened NIC
-set netX/ip <%= ip %>
-set netX/netmask <%= mask %>
-<% if gw.present? %>
-set netX/gateway <%= gw %>
-<% end %>
-ifstat net${idx}
-route
-
-# Note: When multiple DNS servers are specified, only the first
-# server will be used. See: http://ipxe.org/cfg/dns
-<% if dns.present? -%>
-echo Using DNS <%= dns %>
-set dns <%= dns %>
-set domain <%= interface.domain.to_s %>
-<% end %>
-
-echo Trying to ping Gateway: ${netX/gateway}
-ping --count 1 ${netX/gateway} || echo Ping to Gateway failed or ping command not available.
-<% if dns.present? -%>
-echo Trying to ping DNS: ${netX/dns}
-ping --count 1 ${netX/dns} || echo Ping to DNS failed or ping command not available.
-<% end %>
-
-# Chainload from Foreman rather than embedding OS info here, so the behaviour
-# is entirely dynamic.
-chain <%= bootdisk_chain_url %>
-exit 0
-
-:no_nic
-echo Cannot find interface with MAC <%= interface.mac %>, spawning shell
-shell

data/db/seeds.d/50-bootdisk_templates.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-def read_bootdisk_template(filename)
-  File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', filename))
-end
-
-def ensure_bootdisk_template(name, content)
-  kind = TemplateKind.unscoped.where(name: 'Bootdisk').first_or_create
-  tmpl = ProvisioningTemplate.unscoped.where(name: name).first_or_create do |template|
-    template.attributes = {
-      template_kind_id: kind.id,
-      snippet: false,
-      template: content
-    }
-  end
-  tmpl.attributes = {
-    template: content,
-    default: true,
-    vendor: "Foreman boot disk"
-  }
-  tmpl.locked = true
-  tmpl.organizations = Organization.unscoped.all if SETTINGS[:organizations_enabled]
-  tmpl.locations = Location.unscoped.all if SETTINGS[:locations_enabled]
-
-  metadata = Template.parse_metadata(content)
-  tmpl.description = metadata['description']
-
-  tmpl.save!(validate: false) if tmpl.changes.present?
-end
-
-ProvisioningTemplate.without_auditing do
-  ensure_bootdisk_template("Boot disk iPXE - host", read_bootdisk_template("host.erb"))
-  ensure_bootdisk_template("Boot disk iPXE - generic host", read_bootdisk_template("generic_host.erb"))
-  ensure_bootdisk_template("Boot disk Grub2 EFI - generic host", read_bootdisk_template("generic_efi_host.erb"))
-  ensure_bootdisk_template("Boot disk iPXE - generic static host", read_bootdisk_template("generic_static_host.erb"))
-end