katello 3.6.0 → 3.6.0.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d939b0f76999c8b4811105c3b8357f5298ffe7fa
-  data.tar.gz: 1fa1c0d78c2d7ce024b3c8e640325d1c1bd53f4d
+  metadata.gz: fef4964b5d77e0a6f601ceb21771e60d669f6ea6
+  data.tar.gz: 7869cc0cd7e1430ea04c54145c3027b5ffb65986
 SHA512:
-  metadata.gz: a0cb319515bb5a1d43219315259d27960b816dc5b25e7b24728976d070d906a07a5c8cb793e1b116084782544e52531154369f58ffc2135a55434f783adfb934
-  data.tar.gz: 0567cfcd54cfaa33133c1bdc999c7d2588c5dd9a1f7571d67dc48e1be34ef9816fbb8eadf2c6266c0b1aa42dd84d69dff50b4de02ab47a81dfd39208e2e249b1
+  metadata.gz: 2007080abb9a0a5ed941452bd794c3452a243b7a584bc3e2c4cf9d37de7284b81d79e00b1b739a797c26249f8191ca8367ab24846184cafdef4b345ce924a9d8
+  data.tar.gz: a753b6c0ba880b00ffc60c9d21a51cea36e907ee37445e1d5dc2b464afb7c015fa71d5b6c46fdc2e2499578d871c9473f2a76b3fd6ec0506fb70dee99af5a2b0

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

@@ -165,20 +165,10 @@ module Katello
         end
       end
 
-      def self.propose_custom_fact(facts)
-        setting_fact = Setting[:register_hostname_fact]
-        only_use_custom_fact = Setting[:register_hostname_fact_strict_match]
-
-        if !setting_fact.blank? && !facts[setting_fact].blank?
-          if only_use_custom_fact || ::Host.where(:name => setting_fact.downcase).any?
-            facts[setting_fact]
-          end
-        end
-      end
-
       def self.propose_existing_hostname(facts)
-        if propose_custom_fact(facts)
-          name = propose_custom_fact(facts)
+        setting_fact = Setting[:register_hostname_fact]
+        if !setting_fact.blank? && !facts[setting_fact].blank? && ::Host.where(:name => setting_fact.downcase).any?
+          name = facts[setting_fact]
         elsif ::Host.where(:name => facts['network.hostname'].downcase).any?
           name = facts['network.hostname']
         elsif !facts['network.fqdn'].blank? && ::Host.where(:name => facts['network.fqdn'].downcase).any?

data/app/models/katello/rhsm_fact_importer.rb

@@ -4,9 +4,24 @@ module Katello
       Katello::RhsmFactName
     end
 
-    def normalize(facts)
+    def normalize(_facts)
+      facts = super
       facts = change_separator(facts)
-      super(facts)
+      add_compose_facts(facts)
+    end
+
+    def add_compose_facts(facts)
+      additional_keys = []
+      facts.each_key do |fact_name|
+        parts = fact_name.split(RhsmFactName::SEPARATOR)
+        additional_keys += parts[0..-2].reduce([]) { |memo, part| memo << [memo.last, part].compact.join(RhsmFactName::SEPARATOR) }
+      end
+
+      # add the facts hierarchy to facts hash
+      additional_keys.uniq.each do |key|
+        facts[key] = nil
+      end
+      facts
     end
 
     def change_separator(facts)

data/app/models/setting/content.rb

@@ -65,8 +65,6 @@ class Setting::Content < Setting
                  false, N_('Delete Host upon unregister')),
         self.set('register_hostname_fact', N_("When registering a host via subscription-manager, force use the specified fact (in the form of 'fact.fact')"),
                  '', N_('Subscription manager name registration fact'), nil),
-        self.set('register_hostname_fact_strict_match', N_('If true, and register_hostname_fact is set and provided, registration will look for a new host by name only '\
-                  'using that fact, and will skip all hostname matching'), false, N_('Subscription manager name registration fact strict matching'), nil),
         self.set('erratum_install_batch_size', N_("Errata installed via katello-agent will be triggered in batches of this size. Set to 0 to install all errata in one batch."),
                  0, N_('Erratum Install Batch Size')),
         self.set('default_location_subscribed_hosts',

data/app/services/katello/registration_manager.rb

@@ -53,7 +53,6 @@ module Katello
         host.content_facet = populate_content_facet(host, content_view_environment, host_uuid)
         host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
         host.save! # the host has content and subscription facets at this point
-        create_initial_subscription_status(host)
 
         User.as_anonymous_admin do
           begin
@@ -95,10 +94,6 @@ module Katello
         destroy_host_record(host.id)
       end
 
-      def create_initial_subscription_status(host)
-        ::Katello::SubscriptionStatus.create!(:host => host, :status => ::Katello::SubscriptionStatus::UNKNOWN)
-      end
-
       def create_in_cp_and_pulp(host, content_view_environment, consumer_params, activation_keys)
         # if CP fails, nothing to clean up yet w.r.t. backend services
         cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environment.cp_id, consumer_params, activation_keys.map(&:cp_name))

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -102,9 +102,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             formData.authenticityToken = $window.AUTH_TOKEN.replace(/"/g, '');
             formData.remoteAction = 'errata_install';
             formData.errata = errataIds.join(',');
-            if (selectedHosts.included.ids) {
-                formData.hostIds = selectedHosts.included.ids.join(',');
-            }
+            formData.hostIds = selectedHosts.included.ids.join(',');
             formData.search = selectedHosts.included.search;
             formData.customize = customize;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html

@@ -108,7 +108,7 @@
         <ul uib-dropdown-menu>
           <li>
             <a ui-sref="content-host.packages.actions" translate>
-              Actions
+              Yum Actions
             </a>
           </li>
           <li>

data/lib/katello/engine.rb

@@ -11,7 +11,7 @@ module Katello
       )
     end
 
-    initializer 'katello.mount_engine', :before => :sooner_routes_load, :after => :build_middleware_stack do |app|
+    initializer 'katello.mount_engine', :after => :build_middleware_stack do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/mount_engine.rb"
     end
 
@@ -141,7 +141,7 @@ module Katello
       app.config.autoload_paths += Dir["#{config.root}/app/views/foreman"]
     end
 
-    initializer "katello.paths", :before => :sooner_routes_load do |app|
+    initializer "katello.paths" do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/v2.rb"
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/rhsm.rb"
       app.routes_reloader.paths.unshift("#{Katello::Engine.root}/config/routes/overrides.rb")

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.6.0".freeze
+  VERSION = "3.6.0.1.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.0.1.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2190,12 +2190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ''