katello 2.2.2 → 2.4.0.rc1

data/app/models/katello/glue/candlepin/product.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::Candlepin::Product
     def self.included(base)
@@ -59,21 +47,6 @@ module Katello
       raise e
     end
 
-    def self.import_marketing_from_cp(attrs, engineering_product_ids, &block)
-      attrs = attrs.merge('name' => validate_name(attrs['name']), 'label' => Util::Model.labelize(attrs['name']))
-
-      product = MarketingProduct.new(attrs, &block)
-      product.orchestration_for = :import_from_cp_ar_setup
-      product.save!
-      engineering_product_ids.each do |engineering_product_id|
-        product.marketing_engineering_products.create(:engineering_product_id => engineering_product_id)
-      end
-      product
-    rescue => e
-      Rails.logger.error "Failed to create product #{attrs['name']}: #{e}, #{e.backtrace.join("\n")}"
-      raise e
-    end
-
     module InstanceMethods
       def initialize(attribs = nil, options = {})
         unless attribs.nil?

data/app/models/katello/glue/candlepin/subscription.rb

@@ -0,0 +1,58 @@
+module Katello
+  module Glue::Candlepin::Subscription
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def candlepin_data(cp_id)
+        Katello::Resources::Candlepin::Subscription.get(cp_id)
+      end
+
+      def get_for_owner(organization = self.organization.label)
+        Katello::Resources::Candlepin::Subscription.get_for_owner(organization)
+      end
+    end
+
+    module InstanceMethods
+      def backend_data
+        self.class.candlepin_data(self.cp_id)
+      end
+
+      def query_products
+        self.backend_data["providedProducts"]
+      end
+
+      def import_data
+        subscription_attributes = {}
+        subscription_json = self.backend_data
+
+        subscription_json["product"]["attributes"].map { |attr| subscription_attributes[attr["name"].to_sym] = attr["value"] }
+
+        subscription_attributes[:name] = subscription_json["product"]["name"]
+        subscription_attributes[:product_id] = subscription_json["product"]["id"]
+        subscription_attributes[:instance_multiplier] = subscription_json["product"]["multiplier"]
+        subscription_attributes[:stacking_id] = subscription_json["stackId"]
+        organization = Organization.find_by_label(subscription_json["owner"]["key"]) if subscription_json["owner"]
+        subscription_attributes[:organization_id] = organization.id if organization
+
+        exceptions = subscription_attributes.keys.map(&:to_sym) - self.attribute_names.map(&:to_sym)
+        self.update_attributes!(subscription_attributes.except!(*exceptions))
+        self.create_product_associations
+      end
+
+      def create_product_associations
+        products = self.query_products
+        cp_product_ids = products.map { |product| product["id"] }
+        cp_product_ids << self.product_id if self.product_id
+        cp_product_ids.each do |cp_id|
+          product = ::Katello::Product.where(:cp_id => cp_id)
+          if product.any?
+            ::Katello::SubscriptionProduct.find_or_create_by_subscription_id_and_product_id(self.id, product.first.id)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/katello/glue/elastic_search/backend_indexed_model.rb

@@ -1,14 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 module Katello
   module Glue::ElasticSearch::BackendIndexedModel
     UPDATE_BATCH_SIZE = 200
@@ -27,14 +16,14 @@ module Katello
         self.create_index
 
         total = 0
-        pkgs = fetch_all(total, Katello.config.pulp.bulk_load_size)
+        pkgs = fetch_all(total, SETTINGS[:katello][:pulp][:bulk_load_size])
         until pkgs.empty? #we can't know how many there are, so we have to keep looping until we get nothing
           Tire.index(self.index) do
             import pkgs
           end
 
           total += pkgs.length
-          pkgs = fetch_all(total, Katello.config.pulp.bulk_load_size)
+          pkgs = fetch_all(total, SETTINGS[:katello][:pulp][:bulk_load_size])
         end
         total
       end

data/app/models/katello/glue/elastic_search/content_view_erratum_filter_rule.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::ContentViewErratumFilterRule
     extend ActiveSupport::Concern

data/app/models/katello/glue/elastic_search/content_view_history.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::ContentViewHistory
     extend ActiveSupport::Concern
@@ -25,7 +13,7 @@ module Katello
         indexes :created_at, :type => 'date'
         indexes :environment, :type => 'string'
         indexes :content_view_id, :type => 'integer'
-        indexes :version, :type => 'integer'
+        indexes :version, :type => 'float'
         indexes :user, :type => 'string'
       end
     end

data/app/models/katello/glue/elastic_search/content_view_package_filter_rule.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::ContentViewPackageFilterRule
     extend ActiveSupport::Concern

data/app/models/katello/glue/elastic_search/content_view_package_group_filter_rule.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::ContentViewPackageGroupFilterRule
     extend ActiveSupport::Concern

data/app/models/katello/glue/elastic_search/facet_item.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   class Glue::ElasticSearch::FacetItem
     attr_accessor :term, :count

data/app/models/katello/glue/elastic_search/host_collection.rb

@@ -1,43 +1,10 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::HostCollection
     def self.included(base)
-      base.send :include, Ext::IndexedModel
-
       base.class_eval do
-        update_related_indexes :systems, :name
-
         add_system_hook lambda { |system| system.update_host_collections }
         remove_system_hook lambda { |system| system.update_host_collections }
-
-        index_options :extended_json => :extended_index_attrs,
-                      :json => {:only => [:id, :organization_id, :name, :description, :max_content_hosts]},
-                      :display_attrs => [:name, :description, :system]
-
-        mapping do
-          indexes :name, :type => 'string', :analyzer => :kt_name_analyzer
-          indexes :description, :type => 'string', :analyzer => :kt_name_analyzer
-          indexes :name_sort, :type => 'string', :index => :not_analyzed
-          indexes :name_autocomplete, :type => 'string', :analyzer => 'autcomplete_name_analyzer'
-        end
       end
     end
-
-    def extended_index_attrs
-      {:name_sort => name.downcase, :name_autocomplete => self.name,
-       :system => self.systems.collect { |s| s.name }
-      }
-    end
   end
 end

data/app/models/katello/glue/elastic_search/items.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue
     module ElasticSearch
@@ -69,7 +57,7 @@ module Katello
 
           if query_string.blank?
             all_rows = true
-          elsif search_options[:simple_query] && !Katello.config.simple_search_tokens.any? { |s| search.downcase.match(s) }
+          elsif search_options[:simple_query] && !SETTINGS[:katello][:simple_search_tokens].any? { |s| search.downcase.match(s) }
             query_string  = search_options[:simple_query]
           end
 

data/app/models/katello/glue/elastic_search/job.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::Job
     def self.included(base)

data/app/models/katello/glue/elastic_search/system.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 # Comments below are meant to describe in detail how to use elasticsearch (ES) properly. Systems
 # are most commonly used as a reference for adding other model/view/controllers to katello.
 
@@ -51,7 +39,6 @@ module Katello
                                          :host_collection,
                                          :activation_key,
                                          :installed_products,
-                                         "custom_info.KEYNAME",
                                          :content_view,
                                          :memory,
                                          :sockets,
@@ -69,15 +56,6 @@ module Katello
                 :analyzer => "kt_name_analyzer"
               }
             }
-          },
-          {
-            "custom_info_string" => {
-              :path_match => "custom_info.*",
-              :mapping => {
-                :type => "string",
-                :analyzer => "kt_name_analyzer"
-              }
-            }
           }
         ]
 
@@ -105,8 +83,6 @@ module Katello
           indexes :uuid, :type => 'string', :analyzer => :kt_name_analyzer
           indexes :facts, :path => "just_name" do
           end
-          indexes :custom_info, :path => "just_name" do
-          end
           indexes :status, :type => 'string'
 
           # Sortable attributes
@@ -135,7 +111,6 @@ module Katello
         :activation_key_ids => self.activation_key_ids,
         :installed_products => collect_installed_product_names,
         :sockets => self.sockets,
-        :custom_info => collect_custom_info,
         :content_view => self.content_view.try(:name),
         :environment => self.environment.try(:name),
         :status => self.compliance_color,

data/app/models/katello/glue/elastic_search/task_status.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   module Glue::ElasticSearch::TaskStatus
     def self.included(base)

data/app/models/katello/glue/provider.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 # rubocop:disable SymbolName
 module Katello
   module Glue::Provider
@@ -28,9 +16,8 @@ module Katello
         queue_import_manifest options
       end
 
-      def delete_manifest(options = {})
-        options = options.dup
-        queue_delete_manifest(options)
+      def delete_manifest
+        queue_delete_manifest
       end
 
       def refresh_manifest(upstream, options = {})
@@ -65,28 +52,20 @@ module Katello
         statuses = self.products.reject { |r| r.empty? }.map { |r| r.sync_status }
         return PulpSyncStatus.new(:state => PulpSyncStatus::Status::NOT_SYNCED) if statuses.empty?
 
-        #if any of repos sync still running -> provider sync running
-        idx = statuses.index { |r| r.state.to_s == PulpSyncStatus::Status::RUNNING.to_s }
-        return statuses[idx] unless idx.nil?
-
-        #else if any of repos not synced -> provider not synced
-        idx = statuses.index { |r| r.state.to_s == PulpSyncStatus::Status::NOT_SYNCED.to_s }
-        return statuses[idx] unless idx.nil?
-
-        #else if any of repos sync cancelled -> provider sync cancelled
-        idx = statuses.index { |r| r.state.to_s == PulpSyncStatus::Status::CANCELED.to_s }
-        return statuses[idx] unless idx.nil?
-
-        #else if any of repos sync finished with error -> provider sync finished with error
-        idx = statuses.index { |r| r.state.to_s == PulpSyncStatus::Status::ERROR.to_s }
-        return statuses[idx] unless idx.nil?
+        [PulpSyncStatus::Status::RUNNING,
+         PulpSyncStatus::Status::NOT_SYNCED,
+         PulpSyncStatus::Status::CANCELED,
+         PulpSyncStatus::Status::ERROR].each do |interesting_status|
+          relevant_status =  statuses.find { |s| s[:state].to_s == interesting_status.to_s }
+          return relevant_status if relevant_status
+        end
 
         #else -> all finished
         return statuses[0]
       end
 
       def sync_state
-        self.sync_status.state
+        self.sync_status[:state]
       end
 
       def sync_start
@@ -124,13 +103,6 @@ module Katello
         sync_times.last
       end
 
-      def cancel_sync
-        Rails.logger.debug "Cancelling synchronization of provider #{name}"
-        self.products.each do |p|
-          p.cancel_sync
-        end
-      end
-
       def url_to_host_and_path(url = "")
         parsed = URI.parse(url)
         ["#{parsed.scheme}://#{parsed.host}#{ parsed.port ? ':' + parsed.port.to_s : '' }", parsed.path]
@@ -138,11 +110,7 @@ module Katello
 
       def del_products
         Rails.logger.debug "Deleting all products for provider: #{name}"
-        # we first delete marketing products, because there are no repos for them
-        # and they take care of deleting product <-> content association in CP
-        # for themselves.
-        self.products.where("type = 'MarketingProduct'").uniq.each(&:destroy)
-        self.products.where("type <> 'MarketingProduct'").uniq.each(&:destroy)
+        self.products.uniq.each(&:destroy)
         true
       rescue => e
         Rails.logger.error "Failed to delete all products for provider #{name}: #{e}, #{e.backtrace.join("\n")}"
@@ -217,6 +185,10 @@ module Katello
         Resources::Candlepin::Owner.imports self.organization.label
       end
 
+      def import_logger
+        ::Foreman::Logging.logger('katello/manifest_import_logger')
+      end
+
       # TODO: break up method
       def queue_import_manifest(options) # rubocop:disable MethodLength
         options = options.with_indifferent_access
@@ -227,13 +199,7 @@ module Katello
         #are we refreshing from upstream?
         manifest_refresh = options['zip_file_path'].nil?
 
-        output = ::Logging.appenders.string_io.new('manifest_import_appender')
-        import_logger = ::Logging.logger['manifest_import_logger']
-        import_logger.additive = false
-        import_logger.add_appenders(output)
-
-        options.merge!(:import_logger => import_logger)
-        [Rails.logger, import_logger].each { |l| l.debug "Importing manifest for provider #{self.name}" }
+        import_logger.debug "Importing manifest for provider #{self.name}"
 
         begin
           if manifest_refresh
@@ -253,13 +219,13 @@ module Katello
                            :priority => 4, :action => [self, :owner_import, zip_file_path, options],
                            :action_rollback => [self, :del_owner_import])
           pre_queue.create(:name     => "import of products in manifest #{zip_file_path}",
-                           :priority => 5, :action => [self, :import_products_from_cp, options])
+                           :priority => 5, :action => [self, :import_products_from_cp])
           pre_queue.create(:name     => "refresh product repos",
-                           :priority => 6, :action => [self, :refresh_existing_products]) if manifest_update && Katello.config.use_pulp
+                           :priority => 6, :action => [self, :refresh_existing_products]) if manifest_update && SETTINGS[:katello][:use_pulp]
 
           self.save!
         rescue => error
-          display_manifest_message(manifest_refresh ? 'refresh' : 'import', error, options)
+          display_manifest_message(manifest_refresh ? 'refresh' : 'import', error)
           raise error
         end
       end
@@ -269,8 +235,7 @@ module Katello
       end
 
       # TODO: break up method
-      def import_products_from_cp(options = {}) # rubocop:disable MethodLength
-        import_logger = options[:import_logger]
+      def import_products_from_cp # rubocop:disable MethodLength
         product_in_katello_ids = self.organization.providers.redhat.first.products.pluck("cp_id")
         products_in_candlepin_ids = []
 
@@ -284,32 +249,23 @@ module Katello
           adjusted_eng_products = []
           added_eng_products.each do |product_attrs|
             begin
-              product_attrs.merge!(:import_logger => import_logger)
-
               Glue::Candlepin::Product.import_from_cp(product_attrs) do |p|
                 p.provider = self
                 p.organization_id = self.organization.id
               end
               adjusted_eng_products << product_attrs
-              if import_logger
-                import_logger.info "import of product '#{product_attrs["name"]}' from Candlepin OK"
-              end
+              import_logger.info "import of product '#{product_attrs["name"]}' from Candlepin OK"
             rescue Errors::SecurityViolation => e
               # Do not add non-accessible products
-              [Rails.logger, import_logger].each do |logger|
-                next if logger.nil?
-                logger.info "import of product '#{product_attrs["name"]}' from Candlepin failed"
-                import_logger.info e
-              end
+              logger.info "import of product '#{product_attrs["name"]}' from Candlepin failed"
+              import_logger.info e
             end
           end
 
           product_in_katello_ids.concat(adjusted_eng_products.map { |p| p["id"] })
 
           unless product_in_katello_ids.include?(marketing_product_id)
-            engineering_product_in_katello_ids = Product.in_org(self.organization).
-              where(:cp_id => engineering_product_ids).pluck("#{Katello::Product.table_name}.id")
-            Glue::Candlepin::Product.import_marketing_from_cp(Resources::Candlepin::Product.get(marketing_product_id)[0], engineering_product_in_katello_ids) do |p|
+            Glue::Candlepin::Product.import_from_cp(Resources::Candlepin::Product.get(marketing_product_id)[0]) do |p|
               p.provider = self
               p.organization_id = self.organization.id
             end
@@ -353,45 +309,28 @@ module Katello
       end
 
       def index_subscriptions
-        cp_pools = Resources::Candlepin::Owner.pools(self.organization.label)
-        if cp_pools
-          subscriptions = cp_pools.collect { |cp_pool| Katello::Pool.find_pool(cp_pool['id'], cp_pool) }
-        else
-          subscriptions = []
-        end
-
-        Katello::Pool.index_pools(subscriptions, [{:term => {:org => self.organization.label}}])
-        subscriptions
+        Katello::Subscription.import_all
+        Katello::Pool.import_all
       end
 
       def rollback_delete_manifest
         # Nothing to be done until implemented in katello where possible pulp recovery actions should be done(?)
       end
 
-      def queue_delete_manifest(options)
-        output        = StringIO.new
-        import_logger = Logger.new(output)
-        options.merge!(:import_logger => import_logger)
-        [Rails.logger, import_logger].each { |l| l.debug "Deleting manifest for provider #{self.name}" }
+      def queue_delete_manifest
+        import_logger.debug "Deleting manifest for provider #{self.name}"
 
         begin
           pre_queue.create(:name     => "delete manifest for owner: #{self.organization.name}",
                            :priority => 3, :action => [self, :exec_delete_manifest],
                            :action_rollback => [self, :rollback_delete_manifest])
-          if Katello.config.use_pulp
+          if SETTINGS[:katello][:use_pulp]
             pre_queue.create(:name => "refresh product repos for deletion",
                              :priority => 6, :action => [self, :refresh_existing_products])
           end
           self.save!
-
-          if options[:notify]
-            message = _("Subscription manifest deleted successfully for provider '%s'.")
-            Notify.success message % self.name,
-                           :request_type => 'providers__update_redhat_provider',
-                           :organization => self.organization
-          end
         rescue => error
-          display_manifest_message('delete', error, options)
+          display_manifest_message('delete', error)
           raise error
         end
       end
@@ -409,7 +348,7 @@ module Katello
       # Display appropriate messages when manifest import or delete fails
       # TODO: break up this method
       # rubocop:disable MethodLength
-      def display_manifest_message(type, error, options)
+      def display_manifest_message(type, error)
         # Clean up response from candlepin
         types = {'import' => _('import'), 'delete' => _('delete'), 'refresh' => _('refresh')}  # For i18n
         begin
@@ -425,38 +364,8 @@ module Katello
         end
 
         Rails.logger.error "Error during manifest #{type}: #{results}"
-
-        if options[:notify]
-
-          # For MANIFEST_SAME simply inform that no action was taken
-          if !results['conflicts'].nil? && results['conflicts'].include?('MANIFEST_SAME')
-            error_texts = [
-              _("Subscription manifest import for provider '%s' skipped") % self.name,
-              _("Reason: %s") % _("Manifest subscriptions unchanged from previous")
-            ]
-            error_texts.join('<br />')
-            Notify.message(error_texts, :request_type => 'providers__update_redhat_provider',
-                                        :organization => self.organization)
-          else
-            error_texts = []
-
-            error_texts << _("Subscription manifest %{action} for provider '%{name}' failed") % {:action => types[type], :name => self.name}
-            error_texts << (_("Reason: %s") % results['displayMessage']) unless results['displayMessage'].blank?
-            error_texts.join('<br />')
-
-            Notify.error(error_texts, :request_type => 'providers__update_redhat_provider',
-                                      :organization => self.organization)
-          end
-        end
       end
 
-      # There are two types of products in Candlepin: marketing and engineering.
-      # When promoting, we care only about the engineering products. These are
-      # the products that content/repos are assigned to. The marketing product is
-      # that one that subscriptions are assigned to. Between marketing and
-      # engineering products is M:N relation (see MarketingEngineeringProduct
-      # model)
-      #
       # When a subscription is defined as a virtual data center subscription,
       # its pools will have a seperate 'derived' marketing product and a seperate set
       # of 'derived' engineering products. These products become the marketing and