katello 3.18.1.1 → 3.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b5a21f5447c3d2ba6f03aa43a1ddbd958e9c13676b51798229ffeedf6e6b9e
-  data.tar.gz: 0c188e13dc68b845e3d5fdaa5c2a52a370c7d976f0542d624e07a7676d630b61
+  metadata.gz: cb532cdaf1e25293105ac236fca987d75fb73d336c9a7c48f6d9d5e196b3eee6
+  data.tar.gz: 71581e670f4b0bd9811aaa529ef8fe515a958e9bd9d7a558b6bbda8aa6efdeba
 SHA512:
-  metadata.gz: df5a80b234e5ab2f39a6ef6ac3aa2afc8859e77e4c1719c9dd4e958e75c0dd5c475c9f81ae7867ee65d6c6fc17eaae20fa90b9e025bae14b9ac278fbe1dafb30
-  data.tar.gz: b2d252a12334713a3ce551a7de3b32f1bcdde818707f602b3bfa7779b8493adce51274b70e6acaa90807be0e8cca4ba4fa725b4f3e8c30f307e2075508963c7b
+  metadata.gz: 0630ee6e3a5e8c5ee653a499611bd1e647b62d6d291619c398cd32af95bdf3ef4e2b3b3097f13d53cfc35313d56e1e1a6cd64db1b040ed7775824bc199bbadc7
+  data.tar.gz: 1c6b2912fd5438dcbbcff04c152f45e2cc003535a3ebc8c84fbca5574b5b2e2ccc32684f9a4e61048f9c6f81432eb882a31faf54aba3b7512b5df3bfede1f37c

data/app/assets/stylesheets/katello/katello.scss

@@ -163,78 +163,6 @@ input:focus {
   @extend .status_exclamation_icon;
 }
 
-/* BUTTONS */
-input[type='submit'], button, .button {
-  font-size: 10px;
-  display: inline-block;
-  vertical-align: bottom;
-  background: -moz-linear-gradient(top, #f9f9f9, #f0f0f0, #e5e5e5, #e9e9e9);
-  background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), color-stop(0.9, #e5e5e5), to(#e9e9e9));
-  box-shadow: none;
-  border: 1px solid darken($stroke_color, 20%);
-  color: #221e1f;
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 5px;
-  text-shadow: 0 1px 0 rgba($white_color, 1);
-  min-height: 14px;
-  .nomargin {
-    margin: 0;
-  }
-  &:hover {
-    background: -moz-linear-gradient(top, $white_color, $white_color, #cfcfcf);
-    background: -webkit-gradient(linear, left top, left bottom, from($white_color), color-stop(0.6, $white_color), to(#cfcfcf));
-    box-shadow: 0 1px 2px rgba(0,0,0,0.5);
-    text-decoration: none;
-    color: black;
-  }
-  &:active {
-    background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
-    background: -webkit-gradient(linear, left top, left bottom, from(#c2c3c0), to(#e4e5e4));
-    box-shadow: none;
-    text-decoration: none;
-  }
-  &:focus {
-    text-decoration: none;
-    color: #000;
-    border-width: 2px;
-  }
-  &.dialogbutton {
-    float: right;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.formbutton {
-    display: inline-block;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.actionlink {
-    margin: 40px 0 0;
-  }
-  &.disabled, &[disabled] {
-    cursor: default;
-    background: transparent;
-    opacity: 0.4;
-
-    &:hover {
-      background: transparent;
-      box-shadow: none;
-    }
-  }
-  &.iconbutton {
-    display: inline-block;
-  }
-  &.tiny {
-    padding: 4px;
-    margin: 0;
-    &:active, &:focus {
-      margin: 0;
-      padding: 3px;
-    }
-  }
-}
-
 table {
   border-collapse: collapse;
   border: 1px solid $stroke_color;

data/app/controllers/katello/api/v2/api_controller.rb

@@ -39,8 +39,7 @@ module Katello
     end
 
     def deprecate_katello_agent
-      ::Foreman::Deprecation.api_deprecation_warning("Remote actions using katello-agent are deprecated and will be removed in Katello 4.0.  " \
-                                                         "You may consider switching to Remote Execution.")
+      ::Foreman::Deprecation.api_deprecation_warning("Katello-agent is deprecated and will be removed in a future release.")
     end
 
     def full_result_response(collection)

data/app/controllers/katello/api/v2/content_view_filters_controller.rb

@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :id, :number, :desc => N_("filter identifier"), :required => true

data/app/controllers/katello/concerns/api/v2/authorization.rb

@@ -39,7 +39,20 @@ module Katello
       end
 
       def throw_resource_not_found(name: resource_name, id: params[:id])
-        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}") % {id: id, name: name}
+        perms_message = "Potential missing permissions: " +
+          missing_permissions.map(&:name).join(', ')
+        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}. %{perms_message}") % {id: id, name: name, perms_message: perms_message}
+      end
+
+      def missing_permissions
+        missing_perms = ::Foreman::AccessControl.permissions_for_controller_action(path_to_authenticate)
+
+        # promote_or_remove_content_views_to_environments has a special relationship to promote_or_remove_content_views
+        if path_to_authenticate["controller"] == "katello/api/v2/content_view_versions" &&
+            path_to_authenticate["action"].in?(["promote", "remove_from_environment", "remove", "republish_repositories"])
+          missing_perms << ::Permission.find_by(name: "promote_or_remove_content_views_to_environments")
+        end
+        missing_perms
       end
 
       def throw_resources_not_found(name:, expected_ids: [])

data/app/lib/actions/katello/host/update_system_purpose.rb

@@ -14,7 +14,7 @@ module Actions
             host.subscription_facet.purpose_addons = purpose_addon_objects
           end
 
-          host.subscription_facet.save!
+          host.save!
           plan_self(:hostname => host.name)
         end
 

data/app/lib/actions/pulp3/content_migration_reset.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Pulp3
+    class ContentMigrationReset < Pulp3::AbstractAsyncTask
+      def plan(smart_proxy)
+        plan_self(smart_proxy_id: smart_proxy.id)
+      end
+
+      def invoke_external_task
+        migration_service = ::Katello::Pulp3::Migration.new(smart_proxy)
+        migration_service.reset
+      end
+
+      def humanized_name
+        _("Content Migration Reset")
+      end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Skip
+      end
+    end
+  end
+end

data/app/models/katello/concerns/pulp_database_unit.rb

@@ -218,6 +218,18 @@ module Katello
       def db_values(new_ids, pulp_id_href_map, repository)
         new_ids.map { |unit_id| [unit_id.to_i, pulp_id_href_map.dig(unit_id), repository.id.to_i, Time.now.utc.to_s(:db), Time.now.utc.to_s(:db)].compact }
       end
+
+      def unmigrated_content
+        self.where(migrated_pulp3_href: nil, ignore_missing_from_migration: false)
+      end
+
+      def missing_migrated_content #missing or corrupted content that could not be migrated
+        self.where(migrated_pulp3_href: nil, missing_from_migration: true, ignore_missing_from_migration: false)
+      end
+
+      def ignored_missing_migrated_content
+        self.where(migrated_pulp3_href: nil, missing_from_migration: true, ignore_missing_from_migration: true)
+      end
     end
   end
 end

data/app/models/katello/concerns/redhat_extensions.rb

@@ -44,8 +44,8 @@ module Katello
 
       def kickstart_repos(host)
         distros = distribution_repositories(host).where(distribution_bootable: true)
-        if distros && host.content_source
-          distros.map { |distro| distro.to_hash(host.content_source) }
+        if distros && host&.content_facet&.content_source
+          distros.map { |distro| distro.to_hash(host.content_facet.content_source) }
         else
           []
         end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -179,7 +179,9 @@ module Katello
       end
 
       def fix_pulp3_capabilities(type)
-        if missing_pulp3_capabilities? && !pulp2_preferred_for_type?(type)
+        repository_type_obj = type.is_a?(String) ||  type.is_a?(Symbol) ? Katello::RepositoryTypeManager.repository_types[type] : type
+
+        if missing_pulp3_capabilities? && repository_type_obj.pulp3_plugin && !pulp2_preferred_for_type?(repository_type_obj.id)
           self.refresh
           if self.capabilities(::SmartProxy::PULP3_FEATURE).empty?
             fail Katello::Errors::PulpcoreMissingCapabilities

data/app/models/katello/file_unit.rb

@@ -13,6 +13,10 @@ module Katello
       order(:name)
     end
 
+    def filename
+      path
+    end
+
     def self.total_for_repositories(repos)
       self.in_repositories(repos).count
     end

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -60,17 +60,7 @@ module Katello
       end
 
       def fetch_rpm_content_ids
-        # Query for applicable RPM ids
-        # -> Include all non-modular rpms or rpms that exist within installed module streams
-        enabled_module_stream_ids = ::Katello::ModuleStream.
-          joins("inner join katello_available_module_streams on
-            katello_module_streams.name = katello_available_module_streams.name and
-            katello_module_streams.stream = katello_available_module_streams.stream").
-          joins("inner join katello_host_available_module_streams on
-            katello_available_module_streams.id = katello_host_available_module_streams.available_module_stream_id").
-          where("katello_host_available_module_streams.host_id = :content_facet_id and
-            katello_host_available_module_streams.status = 'enabled'",
-            :content_facet_id => self.content_facet.host.id).select(:id)
+        enabled_module_stream_ids = fetch_enabled_module_stream_ids
 
         ::Katello::Rpm.
           joins("INNER JOIN katello_repository_rpms ON
@@ -88,9 +78,37 @@ module Katello
             :bound_library_repos => self.bound_library_instance_repos).
           where("katello_host_installed_packages.host_id = :content_facet_id",
             :content_facet_id => self.content_facet.host.id).
-          where("katello_module_stream_rpms.module_stream_id is null or
-            katello_module_stream_rpms.module_stream_id in (:enabled_module_streams)",
-            :enabled_module_streams => enabled_module_stream_ids).pluck(:id).uniq
+          where("(katello_module_stream_rpms.module_stream_id IS NULL AND
+            katello_installed_packages.id NOT IN (:locked_modular_installed_packages)) OR
+            (katello_module_stream_rpms.module_stream_id IN (:enabled_module_streams)
+            AND katello_installed_packages.id IN (:locked_modular_installed_packages))",
+            :enabled_module_streams => enabled_module_stream_ids,
+            :locked_modular_installed_packages => locked_modular_installed_packages(enabled_module_stream_ids)).pluck(:id).uniq
+      end
+
+      def fetch_enabled_module_stream_ids
+        # Query for applicable RPM ids
+        # -> Include all non-modular rpms or rpms that exist within installed module streams
+        ::Katello::ModuleStream.
+          joins("inner join katello_available_module_streams on
+            katello_module_streams.name = katello_available_module_streams.name and
+            katello_module_streams.stream = katello_available_module_streams.stream").
+          joins("inner join katello_host_available_module_streams on
+            katello_available_module_streams.id = katello_host_available_module_streams.available_module_stream_id").
+          where("katello_host_available_module_streams.host_id = :content_facet_id and
+            katello_host_available_module_streams.status = 'enabled'",
+            :content_facet_id => self.content_facet.host.id).select(:id)
+      end
+
+      # Installed packages that are locked for the host due to enabled module stream membership
+      def locked_modular_installed_packages(enabled_module_streams)
+        rpms_in_enabled_module_streams = ::Katello::Rpm.
+          joins("INNER JOIN katello_module_stream_rpms ON katello_rpms.id = katello_module_stream_rpms.rpm_id").
+          where("katello_module_stream_rpms.module_stream_id IN (:enabled_module_streams)",
+                :enabled_module_streams => enabled_module_streams).select(:nvra, :epoch)
+
+        ::Katello::InstalledPackage.where(nvra: rpms_in_enabled_module_streams.map(&:nvra),
+                                          epoch: rpms_in_enabled_module_streams.map(&:epoch)).select(:id)
       end
 
       def newest_distinct_installed_packages_query

data/app/services/katello/pulp3/erratum.rb

@@ -35,7 +35,8 @@ module Katello
         custom_json["issued"] = convert_date_if_epoch(custom_json["issued"])
         custom_json["updated"] = convert_date_if_epoch(custom_json["updated"]) unless custom_json["updated"].blank?
 
-        if model.updated.blank? || (custom_json['updated'].to_datetime != model.updated.to_datetime)
+        if model.updated.blank? ||
+            (custom_json['updated'] && (custom_json['updated'].to_datetime != model.updated.to_datetime))
           custom_json['errata_id'] = custom_json.delete('id')
           custom_json['errata_type'] = custom_json.delete('type')
           custom_json['updated'] = custom_json['updated'].blank? ? custom_json['issued'] : custom_json['updated']

data/app/services/katello/pulp3/migration.rb

@@ -15,6 +15,10 @@ module Katello
         Katello::Erratum
       ].freeze
 
+      CORRUPTABLE_CONTENT_TYPES = [
+        Katello::Rpm, Katello::FileUnit
+      ].freeze
+
       def self.repository_types_for_migration
         #we can migrate types that pulp3 supports, but are overridden to pulp2.  These are in 'migration mode'
         overridden = (SETTINGS[:katello][:use_pulp_2_for_content_type] || {}).keys.select { |key| SETTINGS[:katello][:use_pulp_2_for_content_type][key] }
@@ -104,6 +108,7 @@ module Katello
             Katello::RepositoryTypeManager.repository_types[repository_type_label].content_types_to_index.each do |content_type|
               Katello::Logging.time("CONTENT_MIGRATION - Importing Content", data: {type: content_type.label}) do
                 import_content_type(content_type)
+                mark_missing_content(content_type)
               end
             end
           end
@@ -114,6 +119,44 @@ module Katello
         Katello::Pulp3::MigrationPlan.new(@repository_types).generate.as_json
       end
 
+      def reset
+        if @repository_types.empty?
+          fail ::Katello::Errors::Pulp3MigrationError, 'There are no Pulp 3 content types to reset'
+        end
+
+        plugins = @repository_types.sort.map do |repository_type|
+          {
+            type: ::Katello::Pulp3::MigrationPlan.pulp2_repository_type(repository_type)
+          }
+        end
+        plan = { plugins: plugins }
+
+        # TODO: Don't provide the plan as a string once this is resolved: https://pulp.plan.io/issues/8211
+        migration_plan_api.reset(migration_plan_api.create(plan: plan).pulp_href, plan.to_json)
+
+        content_types_for_migration.each do |content_type|
+          if content_type.model_class == ::Katello::Erratum
+            ::Katello::RepositoryErratum.update_all(erratum_pulp3_href: nil)
+          else
+            content_type.model_class.update_all(migrated_pulp3_href: nil)
+          end
+        end
+
+        @repository_types.each do |repo_type|
+          if repo_type == "file"
+            ::Katello::Repository.file_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          elsif repo_type == "docker"
+            ::Katello::Repository.docker_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          elsif repo_type == "yum"
+            ::Katello::Repository.yum_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          end
+        end
+
+        ::Katello::Pulp3::RepositoryReference.destroy_all
+        ::Katello::Pulp3::DistributionReference.destroy_all
+        ::Katello::Pulp3::ContentGuard.destroy_all
+      end
+
       def create_migrations
         plan = migration_plan
         Rails.logger.info("Migration Plan: #{plan}")
@@ -127,7 +170,7 @@ module Katello
       end
 
       def start_migration(plan_href)
-        migration_plan_api.run(plan_href, dry_run: false, validate: true)
+        migration_plan_api.run(plan_href, dry_run: false, validate: true, skip_corrupted: true)
       end
 
       def import_repositories(repository_type_label)
@@ -261,6 +304,12 @@ module Katello
                                           on_duplicate_key_update: {conflict_target: [:erratum_id, :repository_id], columns: [:erratum_pulp3_href]})
       end
 
+      def mark_missing_content(content_type)
+        unless [Katello::DockerTag, Katello::DockerManifest, Katello::Erratum].include?(content_type.model_class)
+          content_type.model_class.where(:migrated_pulp3_href => nil).update_all(:missing_from_migration => true)
+        end
+      end
+
       def import_content_type(content_type)
         if content_type.model_class == Katello::Erratum
           import_errata
@@ -280,8 +329,7 @@ module Katello
             update_import_status("Importing migrated content type #{content_type.label}: #{current_count}/#{total_count}")
             migrated_units = pulp2_content_api.list(pulp2_id__in: needing_hrefs.map { |unit| unit.pulp_id }.join(','))
             migrated_units.results.each do |migrated_unit|
-              matching_record = needing_hrefs.find { |db_unit| db_unit.pulp_id == migrated_unit.pulp2_id }
-              matching_record&.update_column(:migrated_pulp3_href, migrated_unit.pulp3_content)
+              content_type.model_class.where(pulp_id: migrated_unit.pulp2_id).update_all(migrated_pulp3_href: migrated_unit.pulp3_content)
             end
           end
         end

data/app/services/katello/pulp3/migration_plan.rb

@@ -21,13 +21,13 @@ module Katello
       def generate_plugins
         @repository_types.sort.map do |repository_type|
           {
-            type: pulp2_repository_type(repository_type),
+            type: self.class.pulp2_repository_type(repository_type),
             repositories: repository_migrations(repository_type)
           }
         end
       end
 
-      def pulp2_repository_type(repository_type)
+      def self.pulp2_repository_type(repository_type)
         if repository_type == 'yum'
           return 'rpm' #migration plugin uses rpm
         else

data/app/services/katello/pulp3/migration_switchover.rb

@@ -21,6 +21,7 @@ module Katello
           Katello::Logging.time("CONTENT_SWITCHOVER - combine_duplicate_content_types") { combine_duplicate_content_types }
           Katello::Logging.time("CONTENT_SWITCHOVER - combine_duplicate_docker_tags") { combine_duplicate_docker_tags } if docker_migration?
           Katello::Logging.time("CONTENT_SWITCHOVER - migrate_pulp3_hrefs") { migrate_pulp3_hrefs }
+          Katello::Logging.time("CONTENT_SWITCHOVER - remove_missing_content") { remove_missing_content }
         end
       end
 
@@ -106,12 +107,27 @@ module Katello
         end
       end
 
-      def migrated_content_type_check
+      def remove_missing_content
         content_types.each do |content_type|
-          if content_type.model_class == Katello::Erratum
-            migrated_errata_check
-          elsif content_type.model_class.where(migrated_pulp3_href: nil).any?
-            fail SwitchOverError, "ERROR: at least one #{content_type.model_class.table_name} record has migrated_pulp3_href NULL value\n"
+          if Migration::CORRUPTABLE_CONTENT_TYPES.include?(content_type.model_class)
+            content_type.model_class.ignored_missing_migrated_content.destroy_all
+          else
+            content_type.model_class.unmigrated_content.destroy_all
+          end
+        end
+      end
+
+      def migrated_content_type_check
+        content_classes = content_types.map(&:model_class)
+        migrated_errata_check if content_classes.include?(Katello::Erratum)
+
+        (content_classes & Migration::CORRUPTABLE_CONTENT_TYPES).each do |content_type|
+          if content_type.missing_migrated_content.any?
+            fail SwitchOverError, "ERROR: at least one #{content_type.table_name} record has been detected as corrupt or missing. Run 'foreman-rake katello:pulp3_migration_stats' for more information.\n"
+          end
+
+          if content_type.unmigrated_content.any?
+            fail SwitchOverError, "ERROR: at least one #{content_type.table_name} record was not able to be migrated\n"
           end
         end
       end

data/app/services/katello/pulp3/repository.rb

@@ -1,6 +1,7 @@
 require "pulpcore_client"
 module Katello
   module Pulp3
+    # rubocop:disable Metrics/ClassLength
     class Repository
       include Katello::Util::HttpProxy
       attr_accessor :repo
@@ -257,8 +258,12 @@ module Katello
         create_version(:base_version => from_repository.version_href)
       end
 
+      def version_zero?
+        repo.version_href.ends_with?('/versions/0/')
+      end
+
       def delete_version
-        ignore_404_exception { api.repository_versions_api.delete(repo.version_href) }
+        ignore_404_exception { api.repository_versions_api.delete(repo.version_href) } unless version_zero?
       end
 
       def create_version(options = {})
@@ -300,7 +305,7 @@ module Katello
         }
         remote_options[:url] = root.url unless root.url.blank?
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?
-        if root.upstream_username && root.upstream_password
+        if !root.upstream_username.blank? && !root.upstream_password.blank?
           remote_options.merge!(username: root.upstream_username,
                                password: root.upstream_password)
         end

data/app/services/katello/pulp3/repository/yum.rb

@@ -14,7 +14,16 @@ module Katello
           url, sles_token = extract_sles_token
           options = common_remote_options
           options.merge!(sles_auth_token: sles_token) if sles_token
-          options.merge!(url: url, policy: root.download_policy)
+
+          options.merge!(url: url, policy: translated_download_policy)
+        end
+
+        def translated_download_policy
+          if root.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND
+            ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
+          else
+            root.download_policy
+          end
         end
 
         def extract_sles_token

data/app/views/katello/sync_management/_products.html.erb

@@ -42,5 +42,5 @@
     </tbody>
   </table>
 
-  <%= submit_tag _('Synchronize Now'), :class => 'button fr', :id => 'sync_button' %>
+  <%= submit_tag _('Synchronize Now'), :class => 'btn btn-default fr', :id => 'sync_button' %>
 <% end %>

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -329,7 +329,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def up
-    if User.where(:login => User::ANONYMOUS_API_ADMIN).first.nil?
+    unless User.unscoped.where(:login => User::ANONYMOUS_API_ADMIN).exists?
       logger.warn("Foreman anonymous admin does not exist, skipping content host migration.")
       return
     end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -1,6 +1,6 @@
 class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
   def up
-    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+    if User.unscoped.where(login: User::ANONYMOUS_ADMIN).exists?
       User.as_anonymous_admin do
         copy_data_from_hostgroup
       end
@@ -46,7 +46,10 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        content_facet.save!
+        unless content_facet.save
+          Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
+          Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
+        end
       end
     end
   end

data/db/migrate/20210201165835_add_migration_missing_content.rb

@@ -0,0 +1,12 @@
+class AddMigrationMissingContent < ActiveRecord::Migration[6.0]
+  def change
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+                      Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag,
+                      Katello::Deb]
+
+    content_models.each do |model|
+      add_column model.table_name, :missing_from_migration, :bool, :default => false, :null => false
+      add_column model.table_name, :ignore_missing_from_migration, :bool, :default => false, :null => false
+    end
+  end
+end

data/engines/bastion/app/assets/javascripts/bastion/auth/authorization.service.js

@@ -20,7 +20,7 @@ angular.module('Bastion.auth').service('Authorization', ['CurrentUser', 'Permiss
                 allowedTo = model.permissions[permissionName];
             } else {
                 angular.forEach(Permissions, function (permission) {
-                    if (permission.permission.name === permissionName) {
+                    if (permission.name === permissionName) {
                         allowedTo = true;
                     }
                 });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html

@@ -1,7 +1,7 @@
 <section>
   <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html

@@ -1,8 +1,7 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header" translate>Content Host System Purpose</h4>
+  <h2 data-block="modal-header" translate>Assign System Purpose</h2>
 
   <div data-block="modal-body">
-    <h4 translate>Assign System Purpose:</h4>
 
     <div class="row">
       <div class="col-sm-12">
@@ -10,67 +9,63 @@
       </div>
     </div>
 
+    <div bst-alert="info">
+      <span translate>
+        This change will be applied to <b>{{ hostCount }} systems.</b>
+      </span>
+    </div>
+    <br />
+
     <form name="contentHostContentForm" class="form" ng-hide="content.workingMode">
-      <div>
-        <label translate>Service Level:</label>
+      <div><b>
+        <dl class="dl-horizontal dl-horizontal-left">
+        <dt><label translate>Service Level (SLA):</label></dt>
 
-        <select type="select"
-                ng-options="item for item in defaultServiceLevels"
-                ng-model="selectedServiceLevels">
-        </select>
-      <br /><br />
+        <dd><select type="select"
+                    ng-options="item for item in defaultServiceLevels"
+                    ng-model="selectedServiceLevels">
+        </select></dd>
+        <br /><br />
 
-        <label translate>Usage Type:</label>
+        <dt style="margin-left: -50px;"><label translate>Usage Type:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultUsages"
                 ng-model="selectedRoles">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label translate>Role:</label>
+        <dt style="margin-left: -98px;"><label translate>Role:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultRoles"
                 ng-model="selectedUsages">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label ng-hide="!purposeAddonsList().length" translate>Add ons:</label>
-        <div class="help-block" style="text-align:left;">
-          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
-        </div>
+        <dt style="margin-left: -75px;"><label ng-hide="!purposeAddonsList().length" translate>Add ons:</label></dt>
 
-        <select multiple ng-multiple="true"
+        <dd><select multiple ng-multiple="true"
                 ng-hide="!purposeAddonsList().length"
                 ng-options="item for item in purposeAddonsList()"
                 ng-model="selectedAddons">
-        </select>
-        <br /><br />
-
-      </div>
-
-      <div bst-alert="info" ng-show="showConfirm">
-        <span translate>
-          Set System Purpose values on {{ hostCount }} selected content hosts?
-        </span>
-        <div>
-          <br />
-          <button type="button" class="btn btn-primary" ng-click="showConfirm = false; performAction()" translate>Assign</button>
+        </select></dd>
+        <div class="help-block" style="text-align:center; margin-left: -180px;">
+          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
         </div>
+        <br /><br />
+        </dl></b>
       </div>
-
-      <button class="btn btn-primary"
-              type="button"
-              ng-hide="showConfirm"
-              ng-click="showConfirm = true;">
-        <span translate>Assign</span>
-      </button>
-
     </form>
   </div>
 
   <div data-block="modal-footer">
+    <button class="btn btn-primary"
+            type="button"
+            ng-click="performAction()">
+      <span translate>Assign</span>
+    </button>
+
     <button type="button" class="btn btn-default" ng-click="cancel()" translate>
       Cancel
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html

@@ -12,7 +12,7 @@
   <section>
     <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
     </p>
   </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -2778,7 +2778,7 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html
 #: app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html
-msgid "Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution."
+msgid "Katello-agent is deprecated and will be removed in a future release."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,9 +1,7 @@
-load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
-
 namespace :katello do
   desc "Remove orphaned and unneeded content/repos from a smart proxy.\
         Run with SMART_PROXY_ID=1 to run for a single smart proxy."
-  task :delete_orphaned_content => ["environment", "disable_dynflow"] do
+  task :delete_orphaned_content => ["dynflow:client"] do
     User.current = User.anonymous_admin
     smart_proxy_id = ENV['SMART_PROXY_ID']
     if smart_proxy_id

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -3,13 +3,15 @@ require "#{Katello::Engine.root}/app/services/katello/pulp3/migration_switchover
 
 namespace :katello do
   desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
-  task :pulp3_content_switchover => :environment do
+  task :pulp3_content_switchover => ["dynflow:client"] do
+    dryrun = ENV['DRYRUN']
     begin
       User.current = User.anonymous_admin
 
       ActiveRecord::Base.transaction do
         switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_primary)
         switchover_service.run
+        fail "Dryrun completed without error, aborting and rolling back" if dryrun
       end
     rescue Katello::Pulp3::SwitchOverError => e
       $stderr.print(e.message)

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,8 +1,6 @@
-load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
-
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
-  task :pulp3_migration => ["environment", "disable_dynflow", "check_ping"] do
+  task :pulp3_migration => ["dynflow:client", "check_ping"] do
     puts "Starting task."
     SmartProxy.pulp_primary.refresh
 
@@ -30,6 +28,13 @@ namespace :katello do
         $stderr.print(msg)
         fail ForemanTasks::TaskError, task
       else
+        puts
+        Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
+          if type.missing_migrated_content.any?
+            puts "Some corrupted or missing content found, run 'foreman-maintain content migration-stats' for more information."
+            exit(-1)
+          end
+        end
         puts _("Content Migration completed successfully")
       end
     else

data/lib/katello/tasks/pulp3_migration_abort.rake

@@ -1,6 +1,6 @@
 namespace :katello do
   desc "Cancels all running Pulp 2 to 3 migration tasks."
-  task :pulp3_migration_abort => ["environment", "disable_dynflow"] do
+  task :pulp3_migration_abort => ["dynflow:client"] do
     migration_tasks = ForemanTasks::Task::DynflowTask.where(:label => "Actions::Pulp3::ContentMigration").where.not(:state => ["stopped", "paused"])
     cancelled_tasks_count = 0
     migration_tasks.each do |task|

data/lib/katello/tasks/pulp3_migration_approve_corrupted.rake

@@ -0,0 +1,16 @@
+namespace :katello do
+  desc "Marks corrupted or missing content as approved to be ignored during the migration"
+  task :approve_corrupted_migration_content => ["dynflow:client", "check_ping"] do
+    Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
+      type.missing_migrated_content.update_all(:ignore_missing_from_migration => true)
+    end
+    puts "Any missing or corrupt content will be ignored on migration to Pulp 3.  This can be undone with 'foreman-rake katello:unapprove_corrupted_migration_content'"
+  end
+
+  task :unapprove_corrupted_migration_content => ["dynflow:client", "check_ping"] do
+    Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
+      type.ignored_missing_migrated_content.update_all(:ignore_missing_from_migration => false)
+    end
+    puts "Resetting approval on any corrupted or missing content, you may want to re-run the 'foreman-maintain content prepare' step to attempt re-migration."
+  end
+end

data/lib/katello/tasks/pulp3_migration_reset.rake

@@ -0,0 +1,26 @@
+namespace :katello do
+  desc "Reset the Pulp 2 -> Pulp 3 migration for content types that haven't been fully switched over"
+  task :pulp3_migration_reset => ["dynflow:client", "check_ping"] do
+    puts "Starting Content Migration Reset."
+    SmartProxy.pulp_primary.refresh
+
+    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigrationReset, SmartProxy.pulp_primary)
+
+    if ENV['wait'].nil? || ::Foreman::Cast.to_bool(ENV['wait'])
+      until !task.pending? || task.paused?
+        sleep(20)
+        task = ForemanTasks::Task.find(task.id)
+      end
+
+      if task.result == 'warning' || task.result == 'pending'
+        msg = _("Content Migration Reset failed, You will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}\n")
+        $stderr.print(msg)
+        fail ForemanTasks::TaskError, task
+      else
+        puts _("Content Migration Reset completed successfully")
+      end
+    else
+      puts "Content Migration Reset started, you may monitor it at: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}"
+    end
+  end
+end

data/lib/katello/tasks/pulp3_migration_stats.rake

@@ -23,7 +23,7 @@ namespace :katello do
     hours = (migration_minutes / 60) % 60
     minutes = migration_minutes % 60
 
-    puts
+    puts "============Migration Summary================"
     puts "Migrated/Total RPMs: #{migrated_rpm_count}/#{::Katello::Rpm.count}"
     puts "Migrated/Total errata: #{migrated_erratum_count}/#{::Katello::RepositoryErratum.count}"
     puts "Migrated/Total repositories: #{migrated_repo_count}/#{migratable_repo_count}"
@@ -34,8 +34,41 @@ namespace :katello do
     else
       puts "Estimated migration time based on yum content: fewer than 5 minutes"
     end
+
     puts
-    puts "\e[33mNote:\e[0m ensure there is sufficient storage space for /var/lib/pulp/published to double in size before starting the migration process."
+    puts "\e[33mNote:\e[0m ensure there is sufficient storage space for /var/lib/pulp/published to triple in size before starting the migration process."
     puts "Check the size of /var/lib/pulp/published with 'du -sh /var/lib/pulp/published/'"
+
+    displayed_warning = false
+    found_missing = false
+    path = Dir.mktmpdir('unmigratable_content-')
+    Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
+      if type.missing_migrated_content.any?
+        unless displayed_warning
+          displayed_warning = true
+          puts
+          puts "============Missing/Corrupted Content Summary================"
+          puts "WARNING: MISSING OR CORRUPTED CONTENT DETECTED"
+        end
+
+        found_missing = true
+        name = type.name.demodulize
+        puts "Corrupted or Missing #{name}: #{type.missing_migrated_content.count}/#{type.count}"
+
+        File.open(File.join(path, name), 'w') do |file|
+          text = type.missing_migrated_content.map(&:filename).join("\n") + "\n"
+          file.write(text)
+        end
+      end
+    end
+
+    if found_missing
+      puts "Corrupted or missing content has been detected, you can examine the list of content in #{path} and take action by either:"
+      puts "1. Performing a 'Verify Checksum' sync under Advanced Sync Options, let it complete, and re-running the migration"
+      puts "2. Deleting/disabling the affected repositories and running orphan cleanup (foreman-rake katello:delete_orphaned_content) and re-running the migration"
+      puts "3. Manually correcting files on the filesystem in /var/lib/pulp/content/ and re-running the migration"
+      puts "4. Mark currently corrupted or missing content as skipped (foreman-rake katello:approve_corrupted_migration_content).  This will skip migration of missing or corrupted content."
+      puts
+    end
   end
 end

data/lib/katello/tasks/pulp3_post_migration_check.rake

@@ -1,9 +1,7 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
-load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
-
 namespace :katello do
   desc "Runs a post Pulp3 migration check for supported content types."
-  task :pulp3_post_migration_check => [:environment, :disable_dynflow] do
+  task :pulp3_post_migration_check => ["dynflow:client"] do
     User.current = User.anonymous_admin
     repository_types = Katello::Pulp3::Migration.repository_types_for_migration
 

data/lib/katello/tasks/reports.rake

@@ -1,4 +1,7 @@
 load "#{Rails.root}/lib/tasks/reports.rake"
 
 #Katello reports can generate a foreman task, so mark the task as a dynflow client
-["reports:daily", "reports:weekly", "reports:monthly"].each { |task| Rake::Task[task].enhance ["dynflow:client"] }
+["reports:daily", "reports:weekly", "reports:monthly"].each do |task|
+  Rake::Task[task].clear
+  Rake::Task[task].enhance ["dynflow:client"]
+end

data/lib/katello/tasks/repository.rake

@@ -1,12 +1,10 @@
-load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
-
 namespace :katello do
   def commit?
     ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
   end
 
   desc "Check for repositories that have not been published since their last sync, and republish if they have."
-  task :publish_unpublished_repositories => ["environment", "disable_dynflow", "check_ping"] do
+  task :publish_unpublished_repositories => ["dynflow:client", "check_ping"] do
     needing_publish = []
     Organization.find_each do |org|
       if org.default_content_view && !org.default_content_view.versions.empty?
@@ -27,7 +25,7 @@ namespace :katello do
   end
 
   desc "Regnerate metadata for all repositories. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories."
-  task :regenerate_repo_metadata => ["environment", "disable_dynflow", "check_ping"] do
+  task :regenerate_repo_metadata => ["dynflow:client", "check_ping"] do
     User.current = User.anonymous_api_admin
     repos = lookup_repositories
 
@@ -40,7 +38,7 @@ namespace :katello do
   end
 
   desc "Refresh repository metadata for all repositories. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories."
-  task :refresh_pulp_repo_details => ["environment", "disable_dynflow", "check_ping"] do
+  task :refresh_pulp_repo_details => ["dynflow:client", "check_ping"] do
     User.current = User.anonymous_api_admin
     repos = lookup_repositories
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.18.1.1".freeze
+  VERSION = "3.18.2".freeze
 end

data/webpack/components/TypeAhead/TypeAhead.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import Downshift from 'downshift';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import TypeAheadSearch from './pf3Search/TypeAheadSearch';
 // eslint-disable-next-line import/no-named-default
@@ -101,7 +102,7 @@ TypeAhead.propTypes = {
 };
 
 TypeAhead.defaultProps = {
-  actionText: 'Search',
+  actionText: __('Search'),
   initialInputValue: '',
   patternfly4: false,
 };

data/webpack/components/TypeAhead/pf3Search/TypeAheadSearch.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { InputGroup, Button, Icon } from 'patternfly-react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import TypeAheadInput from './TypeAheadInput';
 import TypeAheadItems from './TypeAheadItems';
@@ -46,7 +47,7 @@ TypeAheadSearch.propTypes = {
 };
 
 TypeAheadSearch.defaultProps = {
-  actionText: 'Search',
+  actionText: __('Search'),
 };
 
 export default TypeAheadSearch;

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -51,8 +51,11 @@ class ManageManifestModal extends Component {
   showDeleteManifestModal = () =>
     this.props.setModalOpen({ id: DELETE_MANIFEST_MODAL_ID });
 
-  hideDeleteManifestModal = () =>
-    this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+  hideDeleteManifestModal = () => {
+    if (this.props.deleteManifestModalExists) {
+      this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+    }
+  };
 
   updateRepositoryUrl = (event) => {
     this.setState({ redhat_repository_url: event.target.value });
@@ -326,6 +329,7 @@ ManageManifestModal.propTypes = {
   canImportManifest: PropTypes.bool,
   canDeleteManifest: PropTypes.bool,
   isManifestImported: PropTypes.bool,
+  deleteManifestModalExists: PropTypes.bool,
   canEditOrganizations: PropTypes.bool,
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
@@ -351,6 +355,7 @@ ManageManifestModal.defaultProps = {
   canImportManifest: false,
   canDeleteManifest: false,
   isManifestImported: false,
+  deleteManifestModalExists: false,
   canEditOrganizations: false,
   simpleContentAccess: false,
   simpleContentAccessEligible: undefined,

data/webpack/scenes/Subscriptions/Manifest/index.js

@@ -20,6 +20,7 @@ const mapStateToProps = state => ({
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
+  deleteManifestModalExists: !!state.foremanModals.deleteManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
   simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.1.1
+  version: 3.18.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -360,20 +366,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
@@ -1066,6 +1072,7 @@ files:
 - app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb
 - app/lib/actions/pulp3/content_migration.rb
 - app/lib/actions/pulp3/content_migration_presenter.rb
+- app/lib/actions/pulp3/content_migration_reset.rb
 - app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/content_view_version/create_exporter.rb
 - app/lib/actions/pulp3/content_view_version/create_importer.rb
@@ -2134,6 +2141,7 @@ files:
 - db/migrate/20201012192035_add_metadata_to_katello_content_view_version_export_history.rb
 - db/migrate/20201021150008_add_import_only_to_katello_content_view.rb
 - db/migrate/20201119211133_pulp3_migration_progress.rb
+- db/migrate/20210201165835_add_migration_missing_content.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4479,7 +4487,6 @@ files:
 - lib/katello/tasks/clean_backend_objects.rake
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
-- lib/katello/tasks/common.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/import_applicability.rake
 - lib/katello/tasks/import_subscriptions.rake
@@ -4488,6 +4495,8 @@ files:
 - lib/katello/tasks/pulp3_content_switchover.rake
 - lib/katello/tasks/pulp3_migration.rake
 - lib/katello/tasks/pulp3_migration_abort.rake
+- lib/katello/tasks/pulp3_migration_approve_corrupted.rake
+- lib/katello/tasks/pulp3_migration_reset.rake
 - lib/katello/tasks/pulp3_migration_stats.rake
 - lib/katello/tasks/pulp3_post_migration_check.rake
 - lib/katello/tasks/receptor/extract_orgs.rake
@@ -5068,7 +5077,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman

data/lib/katello/tasks/common.rake

@@ -1,7 +0,0 @@
-namespace :katello do
-  task :disable_dynflow do
-    #Ensures that we run as a dynflow 'client'
-    ::Rails.application.dynflow.initialize!
-    ForemanTasks.dynflow.config.remote = true
-  end
-end