katello 3.0.0.rc1 → 3.0.0.rc2

data/lib/katello/permissions/host_permissions.rb

@@ -10,6 +10,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/auto_attach',
   'katello/api/v2/host_subscriptions/add_subscriptions',
   'katello/api/v2/host_subscriptions/remove_subscriptions',
+  'katello/api/v2/host_subscriptions/content_override',
   'katello/api/v2/hosts_bulk_actions/bulk_add_host_collections',
   'katello/api/v2/hosts_bulk_actions/bulk_remove_host_collections',
   'katello/api/v2/hosts_bulk_actions/install_content',

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.0.rc1"
+  VERSION = "3.0.0.rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -472,7 +472,6 @@ files:
 - app/controllers/katello/auto_complete_search_controller.rb
 - app/controllers/katello/concerns/api/api_controller.rb
 - app/controllers/katello/concerns/api/v2/bulk_hosts_extensions.rb
-- app/controllers/katello/concerns/api/v2/bulk_systems_extensions.rb
 - app/controllers/katello/concerns/api/v2/hostgroups_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb
 - app/controllers/katello/concerns/api/v2/repository_content_controller.rb
@@ -496,6 +495,7 @@ files:
 - app/helpers/katello/activation_keys_helper.rb
 - app/helpers/katello/application_helper.rb
 - app/helpers/katello/concerns/foreman_docker/container_steps_helper_extensions.rb
+- app/helpers/katello/concerns/settings_helper_extensions.rb
 - app/helpers/katello/concerns/smart_proxy_helper_extensions.rb
 - app/helpers/katello/errata_mailer_helper.rb
 - app/helpers/katello/host_collection_events_helper.rb
@@ -554,7 +554,8 @@ files:
 - app/lib/actions/katello/activation_key/reassign.rb
 - app/lib/actions/katello/activation_key/update.rb
 - app/lib/actions/katello/capsule_content/configure_capsule.rb
-- app/lib/actions/katello/capsule_content/create_or_update.rb
+- app/lib/actions/katello/capsule_content/create_repos.rb
+- app/lib/actions/katello/capsule_content/remove_orphans.rb
 - app/lib/actions/katello/capsule_content/remove_unneeded_repos.rb
 - app/lib/actions/katello/capsule_content/sync.rb
 - app/lib/actions/katello/content_view/add_to_environment.rb
@@ -638,6 +639,7 @@ files:
 - app/lib/actions/katello/repository/export.rb
 - app/lib/actions/katello/repository/filtered_index_content.rb
 - app/lib/actions/katello/repository/finish_upload.rb
+- app/lib/actions/katello/repository/import_applicability.rb
 - app/lib/actions/katello/repository/import_upload.rb
 - app/lib/actions/katello/repository/incremental_import.rb
 - app/lib/actions/katello/repository/index_content.rb
@@ -700,6 +702,7 @@ files:
 - app/lib/actions/pulp/repository/create.rb
 - app/lib/actions/pulp/repository/create_in_plan.rb
 - app/lib/actions/pulp/repository/create_upload_request.rb
+- app/lib/actions/pulp/repository/delete_distributor.rb
 - app/lib/actions/pulp/repository/delete_upload_request.rb
 - app/lib/actions/pulp/repository/destroy.rb
 - app/lib/actions/pulp/repository/distributor_publish.rb
@@ -813,6 +816,7 @@ files:
 - app/models/katello/concerns/organization_extensions.rb
 - app/models/katello/concerns/pulp_database_unit.rb
 - app/models/katello/concerns/redhat_extensions.rb
+- app/models/katello/concerns/setting_extensions.rb
 - app/models/katello/concerns/smart_proxy_extensions.rb
 - app/models/katello/concerns/subscription_facet_host_extensions.rb
 - app/models/katello/concerns/user_extensions.rb
@@ -917,6 +921,7 @@ files:
 - app/presenters/katello/activation_key_subscription_presenter.rb
 - app/presenters/katello/content_view_version_compare_presenter.rb
 - app/presenters/katello/host_subscription_presenter.rb
+- app/presenters/katello/product_content_presenter.rb
 - app/presenters/katello/relation_presenter.rb
 - app/presenters/katello/repository_presenter.rb
 - app/presenters/katello/sync_status_presenter.rb
@@ -958,6 +963,7 @@ files:
 - app/views/foreman/smart_proxies/_content_tab.html.erb
 - app/views/foreman/smart_proxies/show.html.erb
 - app/views/foreman/unattended/finish-katello.erb
+- app/views/foreman/unattended/kickstart-katello-atomic.erb
 - app/views/foreman/unattended/kickstart-katello.erb
 - app/views/foreman/unattended/snippets/_subscription_manager_registration.erb
 - app/views/foreman/unattended/userdata-katello.erb
@@ -1039,8 +1045,10 @@ files:
 - app/views/katello/api/v2/host_errata/system_task.json.rabl
 - app/views/katello/api/v2/host_packages/base.json.rabl
 - app/views/katello/api/v2/host_packages/index.json.rabl
+- app/views/katello/api/v2/host_subscriptions/content_override.json.rabl
 - app/views/katello/api/v2/host_subscriptions/events.json.rabl
 - app/views/katello/api/v2/host_subscriptions/index.json.rabl
+- app/views/katello/api/v2/host_subscriptions/product_content.json.rabl
 - app/views/katello/api/v2/hostgroups_extensions/show.json.rabl
 - app/views/katello/api/v2/hosts/base.json.rabl
 - app/views/katello/api/v2/hosts/index.json.rabl
@@ -1108,13 +1116,11 @@ files:
 - app/views/katello/api/v2/sync_plans/available_products.json.rabl
 - app/views/katello/api/v2/sync_plans/index.json.rabl
 - app/views/katello/api/v2/sync_plans/show.json.rabl
-- app/views/katello/api/v2/systems/_content.json.rabl
 - app/views/katello/api/v2/systems/_pool.json.rabl
 - app/views/katello/api/v2/systems/activate.json.rabl
 - app/views/katello/api/v2/systems/add_host_collections.json.rabl
 - app/views/katello/api/v2/systems/available_host_collections.json.rabl
 - app/views/katello/api/v2/systems/base.json.rabl
-- app/views/katello/api/v2/systems/content_override.json.rabl
 - app/views/katello/api/v2/systems/enabled_repos.json.rabl
 - app/views/katello/api/v2/systems/erratum.json.rabl
 - app/views/katello/api/v2/systems/events.json.rabl
@@ -1122,7 +1128,6 @@ files:
 - app/views/katello/api/v2/systems/package.json.rabl
 - app/views/katello/api/v2/systems/package_profile.json.rabl
 - app/views/katello/api/v2/systems/pools.json.rabl
-- app/views/katello/api/v2/systems/product_content.json.rabl
 - app/views/katello/api/v2/systems/regenerate_identity_certificates.json.rabl
 - app/views/katello/api/v2/systems/releases.json.rabl
 - app/views/katello/api/v2/systems/remove_host_collections.json.rabl
@@ -1324,6 +1329,9 @@ files:
 - db/migrate/20160222143432_move_system_description_to_host.rb
 - db/migrate/20160224155909_add_registered_at_to_subscription_facet.rb
 - db/migrate/20160301070319_add_version_ostree_branches.rb
+- db/migrate/20160317171813_change_activation_key_column_names.rb
+- db/migrate/20160323065901_increase_cdn_length.rb
+- db/migrate/20160404132250_remove_katello_from_notification_name.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1332,6 +1340,7 @@ files:
 - db/seeds.d/106-mail_notifications.rb
 - db/seeds.d/107-enable_dynflow.rb
 - db/seeds.d/108-ensure_sync_notification.rb
+- db/seeds.d/109-atomic_os.rb
 - db/seeds.d/75-job_templates.rb
 - engines/bastion_katello/README.md
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js
@@ -1405,7 +1414,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-product-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-products.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html
@@ -1635,6 +1643,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/zanata.xml
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/katello-features.run.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/check-current-organization.run.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization-selector.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organizations.module.js
@@ -1828,9 +1837,6 @@ files:
 - lib/katello/tasks/setup.rake
 - lib/katello/tasks/simplecov.rake
 - lib/katello/tasks/test.rake
-- lib/katello/tasks/upgrades/2.1/import_errata.rake
-- lib/katello/tasks/upgrades/2.2/update_gpg_key_urls.rake
-- lib/katello/tasks/upgrades/2.2/update_metadata_expire.rake
 - lib/katello/tasks/upgrades/2.4/import_distributions.rake
 - lib/katello/tasks/upgrades/2.4/import_package_groups.rake
 - lib/katello/tasks/upgrades/2.4/import_puppet_modules.rake

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

@@ -1,39 +0,0 @@
-module Katello
-  module Concerns
-    module Api::V2::BulkSystemsExtensions
-      extend ActiveSupport::Concern
-
-      def find_bulk_systems(permission, bulk_params, restrict_to = nil)
-        #works on a structure of param_group bulk_params and transforms it into a list of systems
-        organization = find_organization
-        bulk_params[:included] ||= {}
-        bulk_params[:excluded] ||= {}
-        @hosts = []
-
-        unless bulk_params[:included][:ids].blank?
-          @hosts = ::Host::Managed.authorized(permission).where(:id => bulk_params[:included][:ids])
-          @hosts = @hosts.where(:organization_id => organization.id) if organization
-          @hosts = @hosts.where('id not in (?)', bulk_params[:excluded]) unless bulk_params[:excluded][:ids].blank?
-          @hosts = restrict_to.call(@hosts) if restrict_to
-        end
-
-        if bulk_params[:included][:search]
-          search_hosts = ::Host::Managed.where(:organization_id => organization_id) if params[:organization_id]
-          search_hosts = search_hosts.search_for(bulk_params[:included][:search])
-          @hosts += search_hosts
-        end
-
-        if bulk_params[:included][:ids].blank? && bulk_params[:included][:search].nil?
-          fail HttpErrors::BadRequest, _("No hosts have been specified.")
-        elsif @hosts.empty?
-          fail HttpErrors::Forbidden, _("Action unauthorized to be performed on selected hosts.")
-        end
-        @hosts
-      end
-
-      def find_organization
-        Organization.find_by_id(params[:organization_id])
-      end
-    end
-  end
-end

data/app/views/katello/api/v2/systems/content_override.json.rabl

@@ -1,3 +0,0 @@
-object false
-
-extends "katello/api/v2/systems/content"

data/app/views/katello/api/v2/systems/product_content.json.rabl

@@ -1,3 +0,0 @@
-object false
-
-extends "katello/api/v2/systems/content"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-product-details.controller.js

@@ -1,97 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-hosts.controller:ContentHostProductDetailsController
- *
- * @requires $scope
- * @requires translate
- * @requires ContentHost
- */
-angular.module('Bastion.content-hosts').controller('ContentHostProductDetailsController',
-    ['$scope', 'translate', 'ContentHost',
-    function ($scope, translate, ContentHost) {
-
-        $scope.expanded = true;
-        $scope.details = null;
-
-        $scope.productDetails = function (product) {
-            var override;
-
-            if ($scope.details === null) {
-                $scope.details = product;
-                angular.forEach($scope.details['available_content'], function (content) {
-                    override = _.findWhere($scope.contentHost["content_overrides"],
-                                           {"contentLabel": content.content.label, name: "enabled"});
-                    if (angular.isUndefined(override)) {
-                        content.overrideEnabled = null;
-                    } else {
-                        content.overrideEnabled = Number(override.value);
-                    }
-                    content.enabledText = $scope.getEnabledText(content.enabled, content.overrideEnabled);
-                });
-            }
-        };
-
-        $scope.overrideEnableChoices = function (content) {
-            var choices;
-            if (content.enabled === true) {
-                choices = [
-                    {name: $scope.getEnabledText(content.enabled, null), id: null},
-                    {name: $scope.getEnabledText(null, 0), id: 0}
-                ];
-            } else {
-                choices = [
-                    {name: $scope.getEnabledText(content.enabled, null), id: null},
-                    {name: $scope.getEnabledText(null, 1), id: 1}
-                ];
-            }
-            return choices;
-        };
-
-        $scope.getEnabledText = function (enabled, overrideEnabled) {
-            var enabledText;
-
-            if (overrideEnabled === null) {
-                enabledText = enabled ? translate("Yes (Default)") : translate("No (Default)");
-            } else if (overrideEnabled === 1) {
-                enabledText = translate("Override to Yes");
-            } else {
-                enabledText = translate("Override to No");
-            }
-
-            return enabledText;
-        };
-
-        $scope.success = function (content) {
-            content.enabledText = $scope.getEnabledText(content.enabled, content.overrideEnabled);
-            $scope.successMessages.push(translate('Updated override to "%x".')
-                    .replace('%x', content.enabledText));
-        };
-
-        $scope.error = function (error) {
-            $scope.errorMessages.push(error.data.errors);
-        };
-
-        $scope.saveContentOverride = function (content) {
-            if (content.overrideEnabled === null) {
-                ContentHost.contentOverride({id: $scope.contentHost.uuid},
-                        {'content_override': {'content_label': content.content.label,
-                                              name: "enabled"}
-                        },
-                        function () {
-                            $scope.success(content);
-                        },
-                        $scope.error);
-            } else {
-                ContentHost.contentOverride({id: $scope.contentHost.uuid},
-                        {'content_override': { 'content_label': content.content.label,
-                                               name: "enabled",
-                                               value: content.overrideEnabled}
-                        },
-                        function () {
-                            $scope.success(content);
-                        },
-                        $scope.error);
-            }
-        };
-    }]
-);

data/lib/katello/tasks/upgrades/2.1/import_errata.rake

@@ -1,45 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '2.1' do
-      task :import_errata => ["environment"]  do
-
-        def error(exception, system)
-          message = _("There was an error updating Content Host %{name} with id %{id}") %
-                               {:name =>system.name, :id => system.id}
-          puts message
-          Rails.logger.error(message)
-          Rails.logger.error(exception.message)
-        end
-
-        def update_system_repositories(system)
-          if system.bound_repositories.empty?
-            puts _("Updating Content Host Repositories %s") % system.name
-            system.bound_repositories << Katello::Repository.where(:pulp_id => system.pulp_bound_yum_repositories)
-            system.save!
-            system.propagate_yum_repos
-          end
-        end
-
-
-        User.current = User.anonymous_api_admin
-
-        puts _("Importing Errata")
-        Katello::Erratum.import_all
-
-        Katello::System.find_each do |system|
-          begin
-            update_system_repositories(system)
-          rescue => e
-            error(e, system)
-          end
-        end
-
-        if Katello::System.any?
-          puts _("Generating applicability for %s Content Hosts") % Katello::System.count
-          ForemanTasks.sync_task(::Actions::Katello::System::GenerateApplicability,
-                                 Katello::System.select([:id, :uuid]).all)
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/2.2/update_gpg_key_urls.rake

@@ -1,20 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '2.2' do
-      task :update_gpg_key_urls => ["environment"]  do
-        User.current = User.anonymous_api_admin
-        puts _("Importing GPG Key Urls to support Capsule Communication")
-
-        Katello::Product.find_each do |product|
-          unless product.redhat?
-            product.repositories.each do |repo|
-              if repo.yum_gpg_key_url && repo.yum_gpg_key_url != repo.content.gpgUrl
-                ForemanTasks.sync_task(::Actions::Katello::Repository::Update, repo, {})
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/katello/tasks/upgrades/2.2/update_metadata_expire.rake

@@ -1,18 +0,0 @@
-namespace :katello do
-  namespace :upgrades do
-    namespace '2.2' do
-      task :update_metadata_expire => ["environment"]  do
-        User.current = User.anonymous_api_admin
-        puts _("Updating Expire Metadata for Custom Content")
-
-        Katello::Product.find_each do |product|
-          unless product.redhat?
-            product.repositories.each do |repo|
-              ForemanTasks.sync_task(::Actions::Katello::Repository::Update, repo, {})
-            end
-          end
-        end
-      end
-    end
-  end
-end