katello 4.10.0.rc1 → 4.10.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9db7d1d03acdd894e7da09e675d883390b6c89438fcc29c15e2a0d29c605fe9
-  data.tar.gz: 22bada45567b4fdddfd8b3e0fe7599608cff84743f9dc0bdf284d2fbdd92f456
+  metadata.gz: cf47fce24e4eb32ab555fa4a624f8cbf2ee04a9911fbe031ee7c005d323a9a50
+  data.tar.gz: 7247fdecda0b42666ac4eefa3ce2d6e8d005c1279bb59ab9cc6847dc79f3476c
 SHA512:
-  metadata.gz: 2e38e417ded6754e6502096e9b01b66d21e097e9fd3d21c4e9a4e205d23754b1c59eb85aee21cd4d1e48844f3cbfaf70506a303a6c929574fec87fd2f9ebf5a9
-  data.tar.gz: 7f1e68bed2dfbc1e14ccf4c71d6a31311910f243bd0fbcc93449a2d8835f4a707117ff8b5f564a8bcfd5f0daffa26b03b5d066a251aaa5e2a310414594be3f53
+  metadata.gz: fec72e7378d6de1ccc70416273228202f1e33e2474799025d8efefb1f851c25948b3a4e7b3995852de983b0f4a6312f18b4b7c5682343a9d16f95f099a4b46aa
+  data.tar.gz: 9f8962a1d46bea986888c5dfb99ba639dd532b5ce9cac04c1d275ba21b7e2d76677cee24ac6c7089a0e1b2ec41bb55db636b32fa92e3d8ca07d13b6b2fc92dda

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -35,7 +35,7 @@ module Katello
     end
 
     def use_install_media(host, options = {})
-      return true if host&.errors && host.errors.include?(:medium_id)
+      return true if host&.errors && host.errors.include?(:medium_id) && host.medium.present?
       kickstart_repository_id(host, options).blank?
     end
 

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -29,7 +29,7 @@ module Katello
         end
 
         def attributes=(attrs)
-          check_cve_attributes(attrs)
+          check_cve_attributes(attrs) unless self.content_facet.blank?
           super
         end
 

data/app/models/katello/host/content_facet.rb

@@ -93,12 +93,13 @@ module Katello
         content_view_environments&.first&.lifecycle_environment
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def assign_single_environment(
         content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
         content_view: nil, lifecycle_environment: nil, environment: nil
       )
-        lifecycle_environment_id ||= environment_id || lifecycle_environment&.id || environment&.id
-        content_view_id ||= content_view&.id
+        lifecycle_environment_id ||= environment_id || lifecycle_environment&.id || environment&.id || self.single_lifecycle_environment&.id
+        content_view_id ||= content_view&.id || self.single_content_view&.id
 
         unless lifecycle_environment_id
           fail _("Lifecycle environment must be specified")

data/app/models/katello/ping.rb

@@ -2,6 +2,7 @@ module Katello
   class Ping
     OK_RETURN_CODE = 'ok'.freeze
     FAIL_RETURN_CODE = 'FAIL'.freeze
+    PACKAGES = %w(katello candlepin pulp foreman hammer).freeze
 
     class << self
       def services(capsule_id = nil)
@@ -142,6 +143,13 @@ module Katello
         result
       end
 
+      # get package information for katello and its components
+      def packages
+        names = PACKAGES.join("|")
+        packages = `rpm -qa | egrep "#{names}"`
+        packages.split("\n").sort
+      end
+
       def pulp_url(capsule_id)
         proxy = fetch_proxy(capsule_id)
         uri = URI.parse(proxy.pulp_url)

data/app/views/overrides/activation_keys/_host_media_type_select.html.erb

@@ -1,9 +1,17 @@
-<% media_selection = using_hostgroups_page? ? use_install_media(@hostgroup) : use_install_media(@host, :selected_host_group => @hostgroup)
+<%
+   if using_discovered_hosts_page?
+     media_selection =  use_install_media(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
+   elsif using_hostgroups_page?
+     media_selection =  use_install_media(@hostgroup)
+     kickstart_options = kickstart_repository_options(@hostgroup)
+   else
+    media_selection = use_install_media(@host, :selected_host_group => @hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @hostgroup)
+   end
    install_media_radio  = media_selection ? 'checked="checked"':''
    synced_content_radio  = media_selection ? '' : 'checked="checked"'
    install_media_disabled = os_media.empty? ? 'disabled = true' : ''
-
-   kickstart_options = using_hostgroups_page? ? kickstart_repository_options(@hostgroup) : kickstart_repository_options(@host, :selected_host_group => @hostgroup)
    synced_content_disabled = kickstart_options.empty? ? 'disabled = true' : ''
 %>
 

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -1,11 +1,19 @@
 <%
-kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
-kickstart_repo_id = 'unset' if kickstart_repo_id.blank?
-host = using_hostgroups_page? ? @hostgroup : @host
-kickstart_options = kickstart_repository_options(host, :selected_host_group => @hostgroup)
-ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id
-ks_repo_select_name =  using_hostgroups_page? ? 'hostgroup[kickstart_repository_id]' : 'host[content_facet_attributes][kickstart_repository_id]'
-ks_repo_select_attr = using_hostgroups_page? ? 'kickstart_repository' : 'content_facet.kickstart_repository'
+   if using_discovered_hosts_page?
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
+   elsif using_hostgroups_page?
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_options = kickstart_repository_options(@hostgroup)
+   else
+     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @hostgroup)
+     kickstart_options = kickstart_repository_options(@host, :selected_host_group => @hostgroup)
+   end
+
+   kickstart_repo_id = 'unset' if kickstart_repo_id.blank?
+   ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id
+   ks_repo_select_name =  using_hostgroups_page? ? 'hostgroup[kickstart_repository_id]' : 'host[content_facet_attributes][kickstart_repository_id]'
+   ks_repo_select_attr = using_hostgroups_page? ? 'kickstart_repository' : 'content_facet.kickstart_repository'
 %>
 
 <% spinner_path = asset_path('spinner.gif') %>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.10.0.rc1".freeze
+  VERSION = "4.10.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.10.0.rc1
+  version: 4.10.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails