engines/bastion_katello/lib/bastion_katello/engine.rb in katello-2.4.5 vs engines/bastion_katello/lib/bastion_katello/engine.rb in katello-3.0.0.rc1

- old
+ new

@@ -4,18 +4,10 @@ initializer 'bastion.assets_dispatcher', :before => :build_middleware_stack do |app| app.middleware.use ::ActionDispatch::Static, "#{BastionKatello::Engine.root}/app/assets/javascripts/bastion_katello" end - initializer "bastion.assets.paths", :group => :all do |app| - app.middleware.use ::ActionDispatch::Static, "#{BastionKatello::Engine.root}/app/assets/javascripts/bastion_katello" - - if defined? Less::Rails - app.config.less.paths << "#{BastionKatello::Engine.root}/app/assets/stylesheets/bastion_katello" - end - end - config.to_prepare do consumer_cert_rpm = 'katello-ca-consumer-latest.noarch.rpm' consumer_cert_rpm = SETTINGS[:katello][:consumer_cert_rpm] if SETTINGS.key?(:katello) Bastion.register_plugin( @@ -38,10 +30,13 @@ host_collections katello_tasks select_organization ), :config => { - 'consumerCertRPM' => consumer_cert_rpm + 'consumerCertRPM' => consumer_cert_rpm, + 'remoteExecutionPresent' => ::Katello.with_remote_execution?, + 'remoteExecutionByDefault' => ::Katello.with_remote_execution? && !Foreman.in_rake?('db:migrate') && + Setting['remote_execution_by_default'] } ) end end end