katello 4.0.3 → 4.1.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js

@@ -19,7 +19,6 @@ angular.module('Bastion.organizations').service('FencedPages', ['$state',
             'lifecycle-environments',
             'packages',
             'products',
-            'puppet-modules',
             'subscriptions',
             'sync-plans',
             'files',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -10,7 +10,6 @@
  * @requires Repository
  * @requires Package
  * @requires PackageGroup
- * @requires PuppetModule
  * @requires DockerManifest
  * @requires DockerManifestList
  * @requires DockerTag
@@ -24,8 +23,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection) {
         var contentTypes;
 
         function success(response, selected) {
@@ -57,7 +56,6 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
         contentTypes = {
             'packages': { type: Package, controllerName: 'katello_rpms' },
             'package-groups': { type: PackageGroup, controllerName: 'katello_package_groups' },
-            'puppet-modules': { type: PuppetModule, controllerName: 'katello_puppet_modules' },
             'docker-manifests': { type: DockerManifest, controllerName: 'katello_docker_manifests' },
             'docker-manifest-lists': { type: DockerManifestList, controllerName: 'katello_docker_manifest_lists' },
             'docker-tags': {type: DockerTag, controllerName: 'katello_docker_tags'},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -27,11 +27,6 @@
       <dd>{{ repository.content_type }}</dd>
     </dl>
 
-    <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
-      <span class="pficon pficon-warning-triangle-o"></span>
-      <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
-    </div>
-
     <div class="divider"></div>
     <h4 translate>Sync Settings</h4>
     <dl class="dl-horizontal dl-horizontal-left">
@@ -116,6 +111,18 @@
         </dd>
       </span>
 
+      <dt ng-show="repository.content_type == 'ansible_collection'" translate>Auth URL</dt>
+      <dd bst-edit-text="repository.ansible_collection_auth_url"
+          on-save="save(repository)"
+          readonly="product.redhat || denied('edit_products', product)">
+      </dd>
+
+      <dt ng-show="repository.content_type == 'ansible_collection'" translate>Auth Token</dt>
+      <dd bst-edit-text="repository.ansible_collection_auth_token"
+          on-save="save(repository)"
+          readonly="product.redhat || denied('edit_products', product)">
+      </dd>
+
       <dt translate>Verify SSL</dt>
       <dd bst-edit-checkbox="repository.verify_ssl_on_sync"
           formatter="booleanToYesNo"
@@ -156,7 +163,7 @@
             on-save="save(repository)">
         </dd>
       </span>
-      <span ng-hide="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
+      <span ng-hide="repository.content_type === 'ostree'">
         <dt translate>Mirror on Sync</dt>
         <dd bst-edit-checkbox="repository.mirror_on_sync"
             formatter="booleanToYesNo"
@@ -398,14 +405,6 @@
             </a>
           </td>
         </tr>
-        <tr ng-show="repository.content_type === 'puppet'">
-          <td translate>Puppet Modules</td>
-          <td class="align-center">
-            <a ui-sref="product.repository.manage-content.puppet-modules({productId: product.id, repositoryId: repository.id})">
-              {{ repository.content_counts.puppet_module || 0 }}
-            </a>
-          </td>
-        </tr>
         <tr ng-show="repository.content_type === 'docker'">
           <td translate>Container Image Manifests</td>
           <td class="align-center">
@@ -470,7 +469,6 @@
     </section>
 
     <section class="well" ng-if="permitted('edit_products', product) && !product.redhat && repository.content_type !== 'docker' && repository.content_type !== 'ostree'">
-      <h5 translate ng-show="repository.content_type === 'puppet'">Upload Puppet Module</h5>
       <h5 translate ng-show="repository.content_type === 'yum'">Upload Package</h5>
       <h5 translate ng-show="repository.content_type === 'file'">Upload File</h5>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -39,11 +39,6 @@
         </select>
       </div>
 
-      <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
-        <span class="pficon pficon-warning-triangle-o"></span>
-        <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 4.0.
-      </div>
-
       <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
         <select id="architecture_restricted"
                 name="architecture_restricted"
@@ -101,6 +96,25 @@
         </a></p>
       </div>
 
+      <div ng-show="repository.content_type === 'ansible_collection'" bst-form-group label="{{ 'Auth URL' | translate }}">
+        <input id="ansible_collection_auth_url"
+               name="ansible_collection_auth_url"
+               ng-model="repository.ansible_collection_auth_url"
+               type="text"/>
+        <p class="help-block" ng-show="repository.content_type === 'ansible_collection'" translate>
+          The URL to receive a session token from, e.g. used with Automation Hub.
+        </p>
+      </div>
+
+      <div ng-show="repository.content_type === 'ansible_collection'" bst-form-group label="{{ 'Auth Token' | translate }}">
+        <input id="ansible_collection_auth_token"
+               name="ansible_collection_auth_token"
+               ng-model="repository.ansible_collection_auth_token"
+               type="text"/>
+        <p class="help-block" ng-show="repository.content_type === 'ansible_collection'" translate>
+          The token key to use for authentication.
+        </p>
+      </div>
 
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases' | translate }}">
         <input id="deb_releases"
@@ -220,7 +234,7 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-hide="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
+      <div class="checkbox" ng-hide="repository.content_type === 'ostree'">
         <label>
           <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
           <span translate>Mirror on Sync</span>
@@ -255,7 +269,7 @@
       </span>
     </div>
 
-    <div ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet' || repository.content_type === 'deb' || repository.content_type === 'file'">
+    <div ng-show="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'file'">
       <h4 ng-show="repository.content_type !== undefined" translate> Published Repository Information </h4>
 
       <div bst-form-group label="{{ 'Checksum' | translate }}" ng-show="repository.content_type === 'yum'">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -90,15 +90,6 @@
                 parent: 'product.repository.info'
             }
         })
-        .state('product.repository.manage-content.puppet-modules', {
-            url: '/content/puppet_modules',
-            permission: 'view_products',
-            templateUrl: 'products/details/repositories/details/views/repository-manage-puppet-modules.html',
-            ncyBreadcrumb: {
-                label: "{{'Manage Puppet Modules' | translate }}",
-                parent: 'product.repository.info'
-            }
-        })
         .state('product.repository.manage-content.docker-manifests', {
             url: '/content/docker_manifests',
             permission: 'view_products',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -105,12 +105,6 @@
             <span ng-hide="repository.url" translate>N/A</span>
           </td>
           <td bst-table-cell>
-            <span ng-show="repository.content_type == 'puppet'">
-              <a translate ui-sref="product.repository.manage-content.puppet-modules({productId: product.id, repositoryId: repository.id})">
-                {{ repository.content_counts.puppet_module || 0 }} Puppet Modules
-              </a>
-            </span>
-
             <span ng-show="repository.content_type == 'yum'">
               <div>
                 <a translate ui-sref="product.repository.manage-content.packages({productId: product.id, repositoryId: repository.id})">

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -34,7 +34,6 @@ module BastionKatello
           packages
           lifecycle_environments
           products
-          puppet_modules
           sync_plans
           host_collections
           katello_tasks
@@ -43,9 +42,10 @@ module BastionKatello
         :config_generator =>  lambda do
           { 'consumerCertRPM' => consumer_cert_rpm,
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
+            'katelloAgentPresent' => ::Katello.with_katello_agent?,
             'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-            'remoteExecutionByDefault' => ::Katello.with_remote_execution? &&
-                                          db_migrated && Setting['remote_execution_by_default']
+            'hostToolingEnabled' => (::Katello.with_katello_agent? || ::Katello.with_remote_execution?) ? true : false,
+            'remoteExecutionByDefault' => ::Katello.remote_execution_by_default?
           }
         end
       )

data/lib/katello/engine.rb

@@ -16,6 +16,9 @@ module Katello
 
       require 'katello/middleware/event_daemon'
       app.middleware.use(Katello::Middleware::EventDaemon)
+
+      require 'katello/middleware/organization_created_enforcer'
+      app.middleware.use(Katello::Middleware::OrganizationCreatedEnforcer)
     end
 
     initializer 'katello.mount_engine', :before => :sooner_routes_load, :after => :build_middleware_stack do |app|
@@ -34,7 +37,7 @@ module Katello
         },
         :pulp => {
           :default_login => 'admin',
-          :bulk_load_size => 2000,
+          :url => 'https://localhost/pulp/api/v2/',
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
@@ -153,8 +156,7 @@ module Katello
       Katello::EventDaemon::Runner.initialize
       Katello::EventDaemon::Runner.register_service(:candlepin_events, Katello::CandlepinEventListener)
       Katello::EventDaemon::Runner.register_service(:katello_events, Katello::EventMonitor::PollerThread)
-      Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver)
-
+      Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver) if ::Katello.with_katello_agent?
       FastGettext.add_text_domain('katello',
                                     :path => File.expand_path("../../../locale", __FILE__),
                                     :type => :po,
@@ -167,7 +169,6 @@ module Katello
       ::Foreman::Renderer::Scope::Variables::Base.include Katello::Concerns::RendererExtensions
 
       # Model extensions
-      ::Environment.include Katello::Concerns::EnvironmentExtensions
       ::Host::Managed.include Katello::Concerns::HostManagedExtensions
       ::Hostgroup.include Katello::Concerns::HostgroupExtensions
       ::Location.include Katello::Concerns::LocationExtensions
@@ -185,7 +186,7 @@ module Katello
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::Foreman::Plugin.fact_importer_registry.register(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
       ::FactParser.register_fact_parser(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactParser)
-      ::RegistrationController.include Katello::Concerns::RegistrationControllerExtensions
+      ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
       #Helper Extensions
       ::SmartProxiesController.class_eval do
@@ -206,7 +207,6 @@ module Katello
       ::OrganizationsController.include Katello::Concerns::OrganizationsControllerExtensions
 
       # Service extensions
-      require "#{Katello::Engine.root}/app/services/katello/puppet_class_importer_extensions"
       require "#{Katello::Engine.root}/lib/proxy_api/pulp"
       require "#{Katello::Engine.root}/lib/proxy_api/pulp_node"
       require "#{Katello::Engine.root}/lib/proxy_api/container_gateway"
@@ -219,21 +219,13 @@ module Katello
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
-      ::PuppetClassImporter.include Katello::Services::PuppetClassImporterExtensions
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
       ::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
-
-      ::HostsController.class_eval do
-        helper Katello::Concerns::HostsAndHostgroupsHelperExtensions
-      end
-
-      ::HostgroupsController.class_eval do
-        helper Katello::Concerns::HostsAndHostgroupsHelperExtensions
-      end
+      ::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions
 
       ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
       ::Widget.singleton_class.prepend Katello::Concerns::WidgetExtensions::ClassMethods
@@ -246,6 +238,7 @@ module Katello
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
       Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, Katello::Events::DeleteHostAgentQueue)
+      Katello::EventQueue.register_event(Katello::Events::DeletePool::EVENT_TYPE, Katello::Events::DeletePool)
     end
 
     rake_tasks do
@@ -260,6 +253,14 @@ module Katello
     (RemoteExecutionFeature rescue false) ? true : false
   end
 
+  def self.with_katello_agent?
+    !!SETTINGS.dig(:katello, :agent, :enabled)
+  end
+
+  def self.remote_execution_by_default?
+    self.with_katello_agent? ? Setting['remote_execution_by_default'] : true
+  end
+
   def self.with_ansible?
     (ForemanAnsible rescue false) ? true : false
   end

data/lib/katello/middleware/organization_created_enforcer.rb

@@ -0,0 +1,22 @@
+module Katello
+  module Middleware
+    class OrganizationCreatedEnforcer
+      def initialize(app)
+        @app = app
+        @all_organizations_created = false
+      end
+
+      def call(env)
+        unless @all_organizations_created
+          begin
+            Katello::OrganizationCreator.create_all_organizations!
+            @all_organizations_created = true
+          rescue Katello::Errors::CandlepinNotRunning, Katello::Errors::PingError
+            ::Katello::UINotifications::SystemError.deliver!({})
+          end
+        end
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/katello/permission_creator.rb

@@ -23,7 +23,8 @@ module Katello
                          {
                            'katello/activation_keys' => [:all, :index],
                            'katello/api/v2/activation_keys' => [:index, :show, :available_host_collections, :available_releases,
-                                                                :product_content, :auto_complete_search]
+                                                                :product_content, :auto_complete_search],
+                           'katello/api/v2/repository_sets' => [:index, :auto_complete_search]
                          },
                          :resource_type => 'Katello::ActivationKey',
                          :finder_scope => :readable
@@ -65,23 +66,19 @@ module Katello
                          :resource_type => "SmartProxy"
     end
 
-    def content_view_permissions # rubocop:disable Metrics/MethodLength
+    def content_view_permissions
       @plugin.permission :view_content_views,
                  {
-                   'katello/api/v2/content_views' => [:index, :show, :available_puppet_modules, :auto_complete_search,
-                                                      :available_puppet_module_names],
+                   'katello/api/v2/content_views' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_filters' => [:index, :show, :auto_complete_search],
-                   'katello/api/v2/content_view_filter_rules' => [:index, :show],
+                   'katello/api/v2/content_view_filter_rules' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_histories' => [:index, :auto_complete_search],
-                   'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_repositories' => [:show_all],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
-                   'katello/api/v2/content_exports' => [:api_status],
                    'katello/api/v2/content_view_components' => [:index, :show],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
-                   'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
@@ -94,23 +91,17 @@ module Katello
                                                 :repos,
                                                 :packages,
                                                 :errata,
-                                                :puppet_modules,
                                                 :packages_items,
                                                 :errata_items,
-                                                :puppet_modules_items,
                                                 :module_streams,
                                                 :ansible_collections,
                                                 :view_packages,
-                                                :view_puppet_modules,
                                                 :repo_packages,
                                                 :repo_errata,
-                                                :repo_puppet_modules,
                                                 :repo_compare_errata,
                                                 :repo_compare_packages,
-                                                :repo_compare_puppet_modules,
                                                 :view_compare_errata,
                                                 :view_compare_packages,
-                                                :view_compare_puppet_modules,
                                                 :views]
                  },
                  :resource_type => 'Katello::ContentView',
@@ -126,7 +117,6 @@ module Katello
                            'katello/api/v2/content_view_versions' => [:update],
                            'katello/api/v2/content_view_filters' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
-                           'katello/api/v2/content_view_puppet_modules' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update]
                          },
                          :resource_type => 'Katello::ContentView',
@@ -142,7 +132,7 @@ module Katello
                          {
                            'katello/api/v2/content_views' => [:publish],
                            'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories],
-                           'katello/api/v2/content_imports' => [:version]
+                           'katello/api/v2/content_imports' => [:version, :index]
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :publishable
@@ -156,7 +146,7 @@ module Katello
       @plugin.permission :export_content_views,
                          {
                            'katello/api/v2/content_view_versions' => [:export],
-                           'katello/api/v2/content_exports' => [:version, :index, :api_status],
+                           'katello/api/v2/content_exports' => [:version, :index],
                            'katello/api/v2/content_export_incrementals' => [:version]
                          },
                          :resource_type => 'Katello::ContentView',
@@ -252,7 +242,7 @@ module Katello
                          :finder_scope => :promotable
     end
 
-    def product_permissions # rubocop:disable Metrics/MethodLength
+    def product_permissions
       @plugin.permission :view_products,
                          {
                            'katello/products' => [:auto_complete, :auto_complete_search],
@@ -273,12 +263,10 @@ module Katello
                            'katello/api/v2/file_units' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
                            'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
                            'katello/errata' => [:short_details, :auto_complete],
                            'katello/packages' => [:details, :auto_complete],
-                           'katello/puppet_modules' => [:show],
                            'katello/files' => [:auto_complete],
                            'katello/repositories' => [:auto_complete_library, :repository_types],
                            'katello/content_search' => [:index,
@@ -286,18 +274,14 @@ module Katello
                                                         :repos,
                                                         :packages,
                                                         :errata,
-                                                        :puppet_modules,
                                                         :packages_items,
                                                         :errata_items,
-                                                        :puppet_modules_items,
                                                         :module_streams,
                                                         :ansible_collections,
                                                         :repo_packages,
                                                         :repo_errata,
-                                                        :repo_puppet_modules,
                                                         :repo_compare_errata,
-                                                        :repo_compare_packages,
-                                                        :repo_compare_puppet_modules],
+                                                        :repo_compare_packages],
                            'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Product',
@@ -349,7 +333,7 @@ module Katello
                          :finder_scope => :exportable
     end
 
-    def subscription_permissions # rubocop:disable Metrics/MethodLength
+    def subscription_permissions
       @plugin.permission :view_subscriptions,
                          {
                            'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search]
@@ -427,13 +411,13 @@ module Katello
     def organization_permissions
       @plugin.permission :import_library_content,
                          {
-                           'katello/api/v2/content_imports' => [:library]
+                           'katello/api/v2/content_imports' => [:library, :index]
                          },
                          :resource_type => 'Organization'
 
       @plugin.permission :export_library_content,
                          {
-                           'katello/api/v2/content_exports' => [:library],
+                           'katello/api/v2/content_exports' => [:library, :index],
                            'katello/api/v2/content_export_incrementals' => [:library]
                          },
                          :resource_type => 'Organization'

data/lib/katello/permissions/host_permissions.rb

@@ -41,7 +41,6 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'hosts/content_hosts',
-  'hosts/puppet_environment_for_content_view',
   'katello/api/v2/host_autocomplete/auto_complete_search',
   'katello/api/v2/host_errata/index',
   'katello/api/v2/host_errata/show',
@@ -60,7 +59,9 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_tracer/index',
   'katello/api/v2/host_tracer/resolve',
   'katello/remote_execution/new',
-  'katello/remote_execution/create'
+  'katello/remote_execution/create',
+  'katello/api/v2/repository_sets/index',
+  'katello/api/v2/repository_sets/auto_complete_search'
 ]
 
 Foreman::AccessControl.permission(:destroy_hosts).actions.concat [

data/lib/katello/plugin.rb

@@ -174,17 +174,6 @@ Foreman::Plugin.register :katello do
            :engine => Katello::Engine,
            :turbolinks => false
     end
-
-    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::PUPPET_TYPE)
-      menu :top_menu,
-           :puppet_modules,
-           :caption => N_('Puppet Modules'),
-           :url => '/puppet_modules',
-           :url_hash => {:controller => 'katello/api/v2/puppet_modules',
-                         :action => 'index'},
-           :engine => Katello::Engine,
-           :turbolinks => false
-    end
   end
 
   menu :top_menu,
@@ -282,13 +271,11 @@ Foreman::Plugin.register :katello do
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
 
-  # Extend Global Registration endpoint
-  extend_allowed_registration_vars :activation_key
-
-  # Extend Global Registration UI
-  extend_page 'registration/_form' do |cx|
-    cx.add_pagelet :global_registration, name: N_('Katello'), partial: 'foreman/hosts/registration', priority: 100, id: 'katello'
-  end
+  # Katello variables for Host Registration
+  extend_allowed_registration_vars :activation_keys
+  extend_allowed_registration_vars :lifecycle_environment_id
+  extend_allowed_registration_vars :force
+  extend_allowed_registration_vars :ignore_subman_errors
 
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
@@ -369,7 +356,7 @@ Foreman::Plugin.register :katello do
     :attach_subscriptions, :view_host_collections,
     :view_organizations, :view_lifecycle_environments, :view_products,
     :view_locations, :view_domains, :view_architectures,
-    :view_operatingsystems
+    :view_operatingsystems, :view_smart_proxies
   ]
 
   def find_katello_assets(args = {})

data/lib/katello/repository_types/ansible_collection.rb

@@ -3,7 +3,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::ANSIBLE_COLLECTIO
   pulp3_skip_publication true
   pulp3_service_class Katello::Pulp3::Repository::AnsibleCollection
   pulp3_api_class Katello::Pulp3::Api::AnsibleCollection
-  pulp3_plugin 'pulp_ansible'
+  pulp3_plugin 'ansible'
 
   content_type Katello::AnsibleCollection, :pulp3_service_class => ::Katello::Pulp3::AnsibleCollection, :user_removable => true
 end

data/lib/katello/repository_types/deb.rb

@@ -2,7 +2,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   service_class Katello::Pulp::Repository::Deb
   pulp3_service_class Katello::Pulp3::Repository::Apt
   pulp3_api_class Katello::Pulp3::Api::Apt
-  pulp3_plugin 'pulp_deb'
+  pulp3_plugin 'deb'
   prevent_unneeded_metadata_publish
 
   default_managed_content_type Katello::Deb

data/lib/katello/repository_types/docker.rb

@@ -4,7 +4,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   pulp3_service_class Katello::Pulp3::Repository::Docker
   pulp3_api_class Katello::Pulp3::Api::Docker
   pulp3_skip_publication true
-  pulp3_plugin 'pulp_container'
+  pulp3_plugin 'container'
 
   set_unique_content_per_repo
 

data/lib/katello/repository_types/file.rb

@@ -3,7 +3,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   service_class Katello::Pulp::Repository::File
   pulp3_service_class Katello::Pulp3::Repository::File
   pulp3_api_class Katello::Pulp3::Api::File
-  pulp3_plugin 'pulp_file'
+  pulp3_plugin 'file'
 
   content_type Katello::FileUnit,
                :pulp2_service_class => ::Katello::Pulp::FileUnit,

data/lib/katello/repository_types/yum.rb

@@ -2,7 +2,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   service_class Katello::Pulp::Repository::Yum
   pulp3_service_class Katello::Pulp3::Repository::Yum
   pulp3_api_class Katello::Pulp3::Api::Yum
-  pulp3_plugin 'pulp_rpm'
+  pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 
   default_managed_content_type Katello::Rpm