katello 3.0.0.rc7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636bd960fc851d7cfc7cad566463d5f9d12ecd31
-  data.tar.gz: 6e0d3f04c2ea64cc9e4d587b634e901328023f99
+  metadata.gz: 50ee4bb4ee7bca71af7c79c1a52cc26adab5e6cd
+  data.tar.gz: 5c41510b896e3e3e5c2109126dc850d789c6b43e
 SHA512:
-  metadata.gz: d95efc1f9e60ae63131a696dc04cc59887f84c59b0da8cca8682af6d94b560267f5b6f2e0a11c66dd249be71438dc88f3de65f0d3b720730db10042e63403cfb
-  data.tar.gz: 7f797259505a86902c5335fed36f1affb78e84f75bcbc0f35709887f6907067c555e17312e75883269a101bfd6cf32e93efc6255a6a87499b5b19f0f2ce0a8c4
+  metadata.gz: 8a6facf5f73221e202cd7dad30bb5b81b9b64bc6ba223696abee7815b258ad2d42592f81a3f021ad47d981e32ae24e309b12f2559456dc1f165faa99aa8e396a
+  data.tar.gz: 7fd62ba9c47195a89655b2bcd542de757c8472aa07a9db0a7604e9af54d3818992a9e9fa7964de2bceed2e9ce5d34483a055b0df050d48467b378fe1af8c614d

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -243,7 +243,7 @@ module Katello
     def facts
       User.as_anonymous_admin do
         sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
-        Katello::Host::SubscriptionFacet.update_facts(@host, rhsm_params[:facts])
+        Katello::Host::SubscriptionFacet.update_facts(@host, rhsm_params[:facts]) unless rhsm_params[:facts].nil?
       end
       render :json => {:content => _("Facts successfully updated.")}, :status => 200
     end
@@ -435,8 +435,8 @@ module Katello
     def authorize_proxy_routes
       deny_access unless (authenticate || authenticate_client)
 
-      route, params = Engine.routes.router.recognize(request) do |rte, parameters|
-        break rte, parameters if rte.name
+      route, _, params = Engine.routes.router.recognize(request) do |rte, match, parameters|
+        break rte, match, parameters if rte.name
       end
 
       # route names are defined in routes.rb (:as => :name)

data/app/lib/actions/candlepin/listen_on_candlepin_events.rb

@@ -144,9 +144,34 @@ module Actions
           end
           unless Rails.env.test?
             world.before_termination do
-              # make sure we close the service at exit to finish the listening action
-              suspended_action.ask(Close).wait
-              self.class.triggered_action.finished.wait
+              finish_service
+            end
+          end
+        end
+      end
+
+      def finish_service
+        log_prefix = "Finishing #{self.class.name} #{task.id}"
+        action_logger.info(log_prefix)
+        # make sure we close the service at exit to finish the listening action
+        suspended_action.ask(Close).wait
+        # if the triggered_action is nil, it means the action was resumed from
+        # previous run due to some unexpected termination of previous process
+        if self.class.triggered_action
+          self.class.triggered_action.finished.wait
+        else
+          max_attempts = 10
+          (1..max_attempts).each do |attempt|
+            task.reload
+            if !task.pending? || task.paused?
+              break
+            else
+              action_logger.info("#{log_prefix}: attempt #{attempt}/#{max_attempts}")
+              if attempt == max_attempts
+                action_logger.info("#{log_prefix} failed, skipping")
+              else
+                sleep 1
+              end
             end
           end
         end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -81,8 +81,8 @@ module Actions
           repos.select do |repo|
             repo_details = capsule.pulp_repo_facts(repo.pulp_id)
             next unless repo_details
-            capsule_importer = repo_details["importers"][0]["config"]
-            !(repo.importer_matches?(capsule_importer))
+            capsule_importer = repo_details["importers"][0].try(:[], "config")
+            capsule_importer.nil? || !(repo.importer_matches?(capsule_importer))
           end
         end
 

data/app/lib/actions/pulp/abstract_async_task.rb

@@ -66,12 +66,6 @@ module Actions
       end
 
       def done?
-        output[:pulp_tasks].each do |pulp_task|
-          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
-            fail pulp_exception
-          end
-        end
-
         external_task.all? { |task| task[:finish_time] || FINISHED_STATES.include?(task[:state]) }
       end
 
@@ -122,6 +116,11 @@ module Actions
         output[:pulp_tasks] = (external_task_data + new_tasks).reject do |task|
           task["task_id"].nil? || (task["tags"] && (task["tags"] & ignored_tags).present?)
         end
+        output[:pulp_tasks].each do |pulp_task|
+          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
+            fail pulp_exception
+          end
+        end
       end
 
       def get_new_tasks(current_list, spawned_task_ids)

data/app/lib/actions/pulp/repository/associate_importer.rb

@@ -1,7 +1,7 @@
 module Actions
   module Pulp
     module Repository
-      class AssociateImporter < Pulp::Abstract
+      class AssociateImporter < Pulp::AbstractAsyncTask
         input_format do
           param :repo_id
           param :type_id
@@ -10,9 +10,8 @@ module Actions
           param :capsule_id
         end
 
-        def run
-          output[:response] = pulp_resources.repository.
-            associate_importer(*input.values_at(:repo_id, :type_id, :config))
+        def invoke_external_task
+          pulp_resources.repository.associate_importer(*input.values_at(:repo_id, :type_id, :config))
         end
       end
     end

data/app/lib/actions/pulp/repository/refresh.rb

@@ -31,7 +31,7 @@ module Actions
                         :repo_id => repository.pulp_id,
                         :type_id => repository.importers.first['importer_type_id'],
                         :config => importer_config,
-                        :capsule_id => input[:capsule_id],
+                        :capsule_id => capsule_id,
                         :hash => { :importer_id => importer.id }
                         )
           end

data/app/models/katello/content_view_history.rb

@@ -42,15 +42,17 @@ module Katello
     end
 
     def humanized_action
-      case self.task.label
+      case self.task.try(:label)
       when "Actions::Katello::ContentViewVersion::Export"
         _("Exported version")
       when "Actions::Katello::ContentView::Publish"
         _("Published new version")
       when "Actions::Katello::ContentView::Promote"
-        _("Promoted to %{environment}") % { :environment => self.environment.name }
+        _("Promoted to %{environment}") % { :environment => self.environment.try(:name) || _('Unknown') }
       when "Actions::Katello::ContentView::Remove"
-        _("Deleted from %{environment}") % { :environment => self.environment.name }
+        _("Deleted from %{environment}") % { :environment => self.environment.try(:name) || _('Unknown')}
+      else
+        _("Unknown Action")
       end
     end
 

data/app/models/katello/glue/pulp/repo.rb

@@ -161,7 +161,7 @@ module Katello
         if capsule
           self.full_path(nil, true)
         else
-          self.url
+          self.url if self.respond_to?(:url)
         end
       end
 

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

@@ -14,14 +14,22 @@ module Katello
       attr_accessible :release_version, :autoheal, :service_level, :host
 
       def update_from_consumer_attributes(consumer_params)
+        import_database_attributes(consumer_params)
+        self.installed_products = consumer_params['installedProducts'] unless consumer_params['installedProducts'].blank?
+        self.hypervisor_guest_uuids = consumer_params['guestIds'] unless consumer_params['hypervisor_guest_uuids'].blank?
+        self.facts = consumer_params['facts'] unless consumer_params['facts'].blank?
+      end
+
+      def import_database_attributes(consumer_params)
         self.autoheal = consumer_params['autoheal'] unless consumer_params['autoheal'].blank?
         self.service_level = consumer_params['serviceLevel'] unless consumer_params['serviceLevel'].blank?
         self.registered_at = consumer_params['created'] unless consumer_params['created'].blank?
         self.last_checkin = consumer_params['lastCheckin'] unless consumer_params['lastCheckin'].blank?
-        self.release_version = consumer_params['releaseVer'] unless consumer_params['releaseVer'].blank?
 
-        if self.release_version.is_a?(Hash)
-          self.release_version = self.release_version['releaseVer']
+        unless consumer_params['releaseVer'].blank?
+          release = consumer_params['releaseVer']
+          release = release['releaseVer'] if release.is_a?(Hash)
+          self.release_version = release
         end
       end
 
@@ -51,7 +59,7 @@ module Katello
       end
 
       def self.update_facts(host, rhsm_facts)
-        return if host.build?
+        return if host.build? || rhsm_facts.nil?
         rhsm_facts[:_type] = RhsmFactName::FACT_TYPE
         rhsm_facts[:_timestamp] = DateTime.now.to_s
         host.import_facts(rhsm_facts)

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -18,7 +18,7 @@ class MigrateContentHosts < ActiveRecord::Migration
   class SmartProxy < ActiveRecord::Base
     self.table_name = "smart_proxies"
 
-    belongs_to :content_host, :class_name => "MigrateContentHosts::ContentHost", :inverse_of => :capsule
+    belongs_to :content_host, :class_name => "MigrateContentHosts::System", :inverse_of => :capsule
   end
 
   class KTEnvironment < ActiveRecord::Base
@@ -74,6 +74,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     self.table_name = "katello_errata"
 
     has_many :systems_applicable, :through => :system_errata, :class_name => "MigrateContentHosts::System", :source => :system
+    has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :source => :erratum
   end
 
   class SystemErratum < ActiveRecord::Base
@@ -143,7 +144,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     belongs_to :content_view, :inverse_of => :content_facets, :class_name => "MigrateContentHosts::ContentView"
     belongs_to :lifecycle_environment, :inverse_of => :content_facets, :class_name => "MigrateContentHosts::KTEnvironment"
 
-    has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facets
+    has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy, :inverse_of => :content_facet
     has_many :bound_repositories, :through => :content_facet_repositories, :class_name => "MigrateContentHosts::Repository", :source => :repository
     has_many :applicable_errata, :through => :content_facet_errata, :class_name => "MigrateContentHosts::Erratum", :source => :erratum
     has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet
@@ -182,13 +183,15 @@ class MigrateContentHosts < ActiveRecord::Migration
     Rails.logger
   end
 
-  def create_content_facet(host, system)
+  def create_content_facet(host, system, include_env_and_view_only = false)
     logger.info("Creating content facet for host #{host.name}.")
     content_facet = host.content_facet = MigrateContentHosts::ContentFacet.new(:content_view => system.content_view,
                                                          :lifecycle_environment => system.environment)
-    content_facet.uuid = system.uuid
-    content_facet.bound_repositories = system.bound_repositories
-    content_facet.applicable_errata = system.applicable_errata
+    unless include_env_and_view_only
+      content_facet.uuid = system.uuid
+      content_facet.bound_repositories = system.bound_repositories
+      content_facet.applicable_errata = system.applicable_errata
+    end
     content_facet.save!
   end
 
@@ -307,6 +310,8 @@ class MigrateContentHosts < ActiveRecord::Migration
       fail _("Some backend services are not running: %s") % ping.inspect
     end
 
+    ::Katello::System.where(:uuid => nil).destroy_all
+
     ensure_one_system_per_hostname(MigrateContentHosts::System.all)
 
     systems = get_systems_with_facts(MigrateContentHosts::System.all)
@@ -342,7 +347,7 @@ class MigrateContentHosts < ActiveRecord::Migration
         end
         host = hosts.first
 
-        create_content_facet(host, system) unless host.content_facet
+        create_content_facet(host, system, true) unless host.content_facet
         unregister_system(system)
 
       else #host exists in the correct org
@@ -353,8 +358,10 @@ class MigrateContentHosts < ActiveRecord::Migration
         create_subscription_facet(host, system) unless host.subscription_facet
       end
 
-      system.host_id = host.id
-      system.save!
+      unless system.destroyed? # if the system was unregistered, it will no longer exist
+        system.host_id = host.id
+        system.save!
+      end
     end
   end
 end

data/db/migrate/20160222143432_move_system_description_to_host.rb

@@ -11,8 +11,7 @@ class MoveSystemDescriptionToHost < ActiveRecord::Migration
     add_column :hosts, :description, :text
 
     System.find_each do |system|
-      system.foreman_host.description = system.description
-      system.foreman_host.save!
+      system.foreman_host.update_attribute(:description, system.description)
     end
 
     remove_column :katello_systems, :description
@@ -22,8 +21,7 @@ class MoveSystemDescriptionToHost < ActiveRecord::Migration
     add_column :katello_systems, :description, :text
 
     System.find_each do |system|
-      system.description = system.foreman_host.description
-      system.save!
+      system.update_attribute(:description, system.foreman_host.description)
     end
 
     remove_column :hosts, :description

data/db/migrate/20160530184400_add_repo_id_indexes.rb

@@ -0,0 +1,10 @@
+class AddRepoIdIndexes < ActiveRecord::Migration
+  def change
+    add_index :katello_repository_docker_manifests, :repository_id
+    add_index :katello_repository_errata, :repository_id
+    add_index :katello_repository_ostree_branches, :repository_id
+    add_index :katello_repository_package_groups, :repository_id
+    add_index :katello_repository_puppet_modules, :repository_id
+    add_index :katello_repository_rpms, :repository_id
+  end
+end

data/lib/katello/engine.rb

@@ -256,6 +256,7 @@ module Katello
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_subscriptions.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/add_export_distributor.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/delete_docker_v1_content.rake"
+      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake"
     end
   end

data/lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake

@@ -0,0 +1,20 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.0' do
+      task :update_puppet_repository_distributors => ["environment"] do
+        User.current = User.anonymous_api_admin
+        puts _("Updating Puppet Repository Distributors")
+        Katello::Repository.puppet_type.each do |repo|
+          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+          ForemanTasks.sync_task(::Actions::Katello::Repository::MetadataGenerate, repo)
+        end
+
+        puts _("Updating Content View Puppet Environment Distributors")
+        Katello::ContentViewPuppetEnvironment.all.each do |repo|
+          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+          ForemanTasks.sync_task(::Actions::Katello::Repository::MetadataGenerate, repo)
+        end
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -7,12 +7,23 @@ namespace :katello do
 
         Katello::Host::SubscriptionFacet.find_each do |subscription_facet|
           begin
-            subscription_facet.update_from_consumer_attributes(subscription_facet.candlepin_consumer.consumer_attributes)
+            candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
+            subscription_facet.import_database_attributes(candlepin_attrs)
+
+            subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
+            subscription_facet.save!
+
+            Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
           rescue RestClient::Exception => exception
             Rails.logger.error exception
           end
-          subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
-          subscription_facet.save!
+        end
+
+        #there may be some invalid hosts, if there are create a primary interface
+        ::Host.includes(:interfaces).find_each do |host|
+          if host.primary_interface.nil?
+            host.interfaces.create!(:primary => true)
+          end
         end
       end
     end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.0.rc7"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc7
+  version: 3.0.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1336,6 +1336,7 @@ files:
 - db/migrate/20160404132250_remove_katello_from_notification_name.rb
 - db/migrate/20160413230128_add_kickstart_repository_to_hosts_and_hostgroups.rb
 - db/migrate/20160426145517_move_host_description_to_host_comment.rb
+- db/migrate/20160530184400_add_repo_id_indexes.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1849,6 +1850,7 @@ files:
 - lib/katello/tasks/upgrades/2.4/import_subscriptions.rake
 - lib/katello/tasks/upgrades/3.0/add_export_distributor.rake
 - lib/katello/tasks/upgrades/3.0/delete_docker_v1_content.rake
+- lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake
 - lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/yard.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -1959,9 +1961,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6