Skip to content

Commit 562c66d

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 651453e commit 562c66d

File tree

7 files changed

+0
-226
lines changed

7 files changed

+0
-226
lines changed

app/controllers/katello/concerns/smart_proxies_controller_extensions.rb

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

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 & 4 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
@@ -188,14 +187,11 @@ class Engine < ::Rails::Engine
188187
require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
189188
require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
190189
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"
193190

194191
#Api controller extensions
195192
::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
196193
::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
197194
::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
198-
::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
199195
::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth
200196
::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
201197
::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)