app/lib/actions/pulp3/repository/refresh_distribution.rb in katello-3.17.0.rc1 vs app/lib/actions/pulp3/repository/refresh_distribution.rb in katello-3.17.0.rc2

@@ -4,22 +4,28 @@
       class RefreshDistribution < Pulp3::AbstractAsyncTask
         include Helpers::Presenter
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
         def plan(repository, smart_proxy, options = {})
+          smart_proxy = SmartProxy.find_by(id: smart_proxy) #support bulk actions
           sequence do
-            options = {:repository_id => repository.id, :smart_proxy_id => smart_proxy.id}
-            options[:contents_changed] if options.key?(:contents_changed)
-            plan_action(::Actions::Pulp3::ContentGuard::Refresh, smart_proxy) unless repository.unprotected
-            action = plan_self(options)
+            if !repository.unprotected && !options[:assume_content_guard_exists]
+              plan_action(::Actions::Pulp3::ContentGuard::Refresh, smart_proxy)
+            end
+
+            refresh_options = {:repository_id => repository.id, :smart_proxy_id => smart_proxy.id}
+            refresh_options[:contents_changed] if options.key?(:contents_changed)
+            action = plan_self(refresh_options)
+
             plan_action(SaveDistributionReferences, repository, smart_proxy,
                         action.output, :contents_changed => options[:contents_changed])
           end
         end
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions
+          #used in switchover, need to assume pulp3
+          repo.backend_service(smart_proxy, true).with_mirror_adapter.refresh_distributions
         end
       end
     end
   end
 end