Skip to content

Commit 2d2f2f5

Browse files
committed
Fixes #37388 - Drop Pulp 2 Smart Proxy status code
These were likely not triggered anymore because the Pulp 2 features were never present.
1 parent b6169e4 commit 2d2f2f5

File tree

8 files changed

+0
-230
lines changed

8 files changed

+0
-230
lines changed

app/controllers/katello/concerns/smart_proxies_controller_extensions.rb

Lines changed: 0 additions & 68 deletions
This file was deleted.

app/models/katello/concerns/smart_proxy_extensions.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
require 'proxy_api'
2-
require 'proxy_api/pulp'
3-
require 'proxy_api/pulp_node'
42
require 'proxy_api/container_gateway'
53

64
module Katello

app/services/katello/proxy_status/pulp.rb

Lines changed: 0 additions & 52 deletions
This file was deleted.

app/services/katello/proxy_status/pulp_node.rb

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/katello/engine.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ class Engine < ::Rails::Engine
156156

157157
#Controller extensions
158158
::HostsController.include Katello::Concerns::HostsControllerExtensions
159-
::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
160159
::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
161160

162161
#Helper Extensions
@@ -178,8 +177,6 @@ class Engine < ::Rails::Engine
178177
::OrganizationsController.include Katello::Concerns::OrganizationsControllerExtensions
179178

180179
# Service extensions
181-
require "#{Katello::Engine.root}/lib/proxy_api/pulp"
182-
require "#{Katello::Engine.root}/lib/proxy_api/pulp_node"
183180
require "#{Katello::Engine.root}/lib/proxy_api/container_gateway"
184181

185182
# We need to explicitly load this files because Foreman has
@@ -188,14 +185,11 @@ class Engine < ::Rails::Engine
188185
require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
189186
require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
190187
require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
191-
require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
192-
require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
193188

194189
#Api controller extensions
195190
::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
196191
::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
197192
::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
198-
::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
199193
::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth
200194
::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
201195
::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions

lib/proxy_api/pulp.rb

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/proxy_api/pulp_node.rb

Lines changed: 0 additions & 22 deletions
This file was deleted.

test/controllers/foreman/smart_proxies_controller_test.rb

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)