Merge pull request #5571 from cfouant/task-status-jobs-elasticsearch

Refs #11752 - removes task status and job from elasticsearch

app/models/katello/job.rb

@@ -3,7 +3,6 @@ class Job < Katello::Model
     self.include_root_in_json = false
 
     include Glue
-    include Glue::ElasticSearch::Job  if SETTINGS[:katello][:use_elasticsearch]
 
     belongs_to :job_owner, :polymorphic => true
 
@@ -36,15 +35,9 @@ def refresh_for_owner(owner)
 
         ids = tasks.select("#{task_status_table}.id").collect { |row| row[:id] }
 
-        # retrieve the jobs associated with those tasks
-        jobs = Job.where("#{task_status_table}.id" => ids).joins(:task_statuses)
-
         # refresh the tasks via pulp
         refresh_tasks(ids) unless ids.empty?
 
-        # update the elasticsearch index for the associated jobs
-        Job.index_import(jobs) unless jobs.empty?
-
         # retrieve the jobs for the current owner (e.g. system group)
         Job.where(:job_owner_id => owner.id, :job_owner_type => owner.class.name)
       end

app/models/katello/pulp_sync_status.rb

@@ -107,8 +107,6 @@ def parse_generic(details, errors)
 
 module Katello
   class PulpSyncStatus < PulpTaskStatus
-    use_index_of TaskStatus if SETTINGS[:katello][:use_elasticsearch]
-
     HISTORY_ERROR = 'failed'
     HISTORY_SUCCESS = 'success'
     FINISHED  = "finished"

app/models/katello/pulp_task_status.rb

@@ -1,6 +1,5 @@
 module Katello
   class PulpTaskStatus < TaskStatus
-    use_index_of TaskStatus if SETTINGS[:katello][:use_elasticsearch]
     WAIT_TIMES = [0.5, 1, 2, 4, 8, 16]
     WAIT_TIME_STEP = 5
 

app/models/katello/task_status.rb

@@ -16,8 +16,6 @@ class Status
       TIMED_OUT = :timed_out
     end
 
-    include Glue::ElasticSearch::TaskStatus if SETTINGS[:katello][:use_elasticsearch]
-
     belongs_to :organization, :inverse_of => :task_statuses, :class_name => "Organization"
     belongs_to :user, :inverse_of => :task_statuses, :class_name => "::User"