katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plans.module.js

@@ -9,6 +9,7 @@ angular.module('Bastion.sync-plans', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common',
     'Bastion.components.formatters'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html

@@ -17,4 +17,8 @@
     You currently don't have any Sync Plans.  A Sync Plan can be created by using the button on the right.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Sync Plans.
+  </span>
+
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks.module.js

@@ -8,7 +8,9 @@
 angular.module('Bastion.tasks', [
     'ngResource',
     'ui.router',
-    'Bastion'
+    'Bastion',
+    'Bastion.components',
+    'Bastion.i18n'
 ]);
 
 /**

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

@@ -19,6 +19,7 @@ module BastionKatello
           content_hosts
           content_views
           docker_tags
+          ostree_branches
           errata
           packages
           gpg_keys

data/lib/katello/engine.rb

@@ -12,7 +12,6 @@ module Katello
         :use_cp => true,
         :rest_client_timeout => 30,
         :gpg_strict_validation => false,
-        :puppet_repo_root => '/etc/puppet/environments/',
         :redhat_repository_url => 'https://cdn.redhat.com',
         :post_sync_url => 'http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello',
         :consumer_cert_rpm => 'katello-ca-consumer-latest.noarch.rpm',
@@ -122,6 +121,7 @@ module Katello
     end
 
     initializer "katello.load_app_instance_data" do |app|
+      app.config.filter_parameters += [:_json] #package profile parameter
       Katello::Engine.paths['db/migrate'].existent.each do |path|
         app.config.paths['db/migrate'] << path
       end
@@ -218,6 +218,7 @@ module Katello
       # We need to explicitly load this files because Foreman has
       # similar strucuture and if the Foreman files are loaded first,
       # autoloading doesn't work.
+      require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
@@ -245,6 +246,14 @@ module Katello
 
       Katello::EventQueue.register_event(Katello::Events::ImportHostErrata::EVENT_TYPE, Katello::Events::ImportHostErrata)
 
+      ::HostsController.class_eval do
+        helper Katello::Concerns::HostsAndHostgroupsHelperExtensions
+      end
+
+      ::HostgroupsController.class_eval do
+        helper Katello::Concerns::HostsAndHostgroupsHelperExtensions
+      end
+
       load 'katello/repository_types.rb'
     end
 
@@ -257,6 +266,7 @@ module Katello
       load "#{Katello::Engine.root}/lib/katello/tasks/reimport.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/rubocop.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/clean_backend_objects.rake"
+      load "#{Katello::Engine.root}/lib/katello/tasks/unify_hosts.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrade_check.rake"
 
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_package_groups.rake"

data/lib/katello/permissions/host_permissions.rb

@@ -3,6 +3,7 @@ require 'katello/plugin.rb'
 Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'api/v2/hosts/host_collections',
   'katello/api/v2/host_errata/apply',
+  'katello/api/v2/host_errata/applicability',
   'katello/api/v2/host_packages/install',
   'katello/api/v2/host_packages/upgrade',
   'katello/api/v2/host_packages/upgrade_all',
@@ -16,7 +17,10 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/install_content',
   'katello/api/v2/hosts_bulk_actions/update_content',
   'katello/api/v2/hosts_bulk_actions/remove_content',
-  'katello/api/v2/hosts_bulk_actions/environment_content_view'
+  'katello/api/v2/hosts_bulk_actions/environment_content_view',
+  'katello/api/rhsm/candlepin_proxies/upload_package_profile',
+  'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
+  'katello/api/rhsm/candlepin_proxies/hypervisors_update'
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
@@ -34,5 +38,13 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
 ]
 
 Foreman::AccessControl.permission(:destroy_hosts).actions.concat [
+  'katello/api/v2/host_subscriptions/destroy',
   'katello/api/v2/hosts_bulk_actions/destroy_hosts'
 ]
+
+Foreman::AccessControl.permission(:create_hosts).actions.concat [
+  'katello/api/v2/host_subscriptions/create',
+  'katello/api/rhsm/candlepin_proxies/consumer_create',
+  'katello/api/rhsm/candlepin_proxies/consumer_show',
+  'katello/api/rhsm/candlepin_proxies/hypervisors_update'
+]

data/lib/katello/plugin.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.9'
+  requires_foreman '>= 1.13'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'), :after => :monitor_menu do
     menu :top_menu,
@@ -117,6 +117,15 @@ Foreman::Plugin.register :katello do
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
+
+    menu :top_menu,
+         :ostree_branches,
+         :caption => N_('OSTree Branches'),
+         :url => '/ostree_branches',
+         :url_hash => {:controller => 'katello/api/v2/ostree_branches',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
   end
 
   menu :top_menu,
@@ -148,6 +157,16 @@ Foreman::Plugin.register :katello do
   apipie_documented_controllers ["#{Katello::Engine.root}/app/controllers/katello/api/v2/*.rb"]
   apipie_ignored_controllers %w(::Api::V2::OrganizationsController)
 
+  parameter_filter ::Host::Managed, :content_source_id, :host_collection_ids => [],
+    :content_facet_attributes => [:content_view_id, :lifecycle_environment_id,
+                                  :host, :kickstart_repository_id],
+    :subscription_facet_attributes => [:release_version, :autoheal, :service_level, :host,
+                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, :hypervisor_guest_uuids => []]
+  parameter_filter Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
+    :kickstart_repository_id
+  parameter_filter Organization, :label, :service_level
+  parameter_filter SmartProxy, :lifecycle_environment_ids => []
+
   logger :glue, :enabled => true
   logger :pulp_rest, :enabled => true
   logger :cp_rest, :enabled => true

data/lib/katello/tasks/reimport.rake

@@ -19,6 +19,7 @@ namespace :katello do
               Katello::PackageGroup,
               Katello::PuppetModule,
               Katello::Rpm,
+              Katello::FileUnit,
               Katello::Subscription,
               Katello::Pool]
 

data/lib/katello/tasks/test.rake

@@ -10,6 +10,7 @@ namespace :test do
           "#{Katello::Engine.root}/spec/**/*_spec.rb"
         ]
         t.verbose = true
+        t.warning = false
       end
 
       Rake::Task[spec_task.name].invoke
@@ -24,6 +25,7 @@ namespace :test do
             "#{Katello::Engine.root}/spec/routing/**/*_spec.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[spec_task.name].invoke
@@ -40,6 +42,7 @@ namespace :test do
           "#{Katello::Engine.root}/test/**/*_test.rb"
         ]
         t.verbose = true
+        t.warning = false
       end
 
       Rake::Task[test_task.name].invoke
@@ -54,6 +57,7 @@ namespace :test do
             "#{Katello::Engine.root}/test/models/**/*_test.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[test_task.name].invoke
@@ -67,6 +71,7 @@ namespace :test do
             "#{Katello::Engine.root}/test/actions/**/*_test.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[test_task.name].invoke
@@ -80,6 +85,7 @@ namespace :test do
             "#{Katello::Engine.root}/test/controllers/**/*_test.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[test_task.name].invoke
@@ -93,6 +99,7 @@ namespace :test do
             "#{Katello::Engine.root}/test/glue/**/*_test.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[test_task.name].invoke
@@ -106,6 +113,7 @@ namespace :test do
             "#{Katello::Engine.root}/test/lib/**/*_test.rb"
           ]
           t.verbose = true
+          t.warning = false
         end
 
         Rake::Task[test_task.name].invoke

data/lib/katello/tasks/unify_hosts.rake

@@ -0,0 +1,91 @@
+namespace :katello do
+  desc "Unify hosts that have registered with both fqdn and shortname.\
+        Run with HOSTS=foobar.example.com,foobar to run for specific hosts."
+  task :unify_hosts => :environment do
+    def main
+      hostnames = ENV['HOSTS'].try(:split, ',')
+      if hostnames.blank?
+        unify_all
+      elsif hostnames.count == 2
+        unify_two(hostnames[0], hostnames[1])
+      else
+        puts "HOSTS specified but did not receive two. Usage: HOSTS=foobar.example.com,foobar"
+      end
+    end
+
+    def unify_all
+      ::Host.unscoped.where("name like '%.%'").find_each do |host|
+        short_host = find_match(host)
+        unify(host, short_host) if short_host
+      end
+    end
+
+    def unify_two(name1, name2)
+      fail _("#{name1} specified twice") if name1 == name2
+      host1 = Host.find_by(:name => name1)
+      host2 = Host.find_by(:name => name2)
+      if host1.nil? || host2.nil?
+        puts "Could not find both hosts #{host1} and #{host2}\n"
+      elsif name1.starts_with?(name2)
+        unify(host1, host2)
+      elsif name2.starts_with?(name1)
+        unify(host2, host1)
+      else
+        puts "#{host1} and #{host2} do not share a host shortname\n"
+      end
+    end
+
+    def find_match(host)
+      #first look based off mac address
+      mac = host.primary_interface.try(:mac)
+      if mac.blank?
+        puts "Skipping #{host.name} due to blank primary interface mac\n"
+        return
+      end
+
+      possible_match = Nic::Base.where("host_id != #{host.id}").where(:mac => mac).first.try(:host)
+      if possible_match && host.name.starts_with?(possible_match.name)
+        possible_match
+      end
+    end
+
+    def unify(fqdn_host, short_host)
+      if fqdn_host.subscription_facet.try(:uuid).nil? && fqdn_host.content_facet.try(:uuid).nil?
+        puts "Unifying #{fqdn_host.name} with #{short_host.name}\n"
+        fqdn_host.subscription_facet.try(:destroy!)
+        fqdn_host.content_facet.try(:destroy!)
+
+        content_facet = short_host.content_facet
+        sub_facet = short_host.subscription_facet
+
+        if content_facet
+          content_facet.host = fqdn_host
+          content_facet.save!
+          content_facet.update_errata_status
+        end
+
+        if sub_facet
+          sub_facet.host = fqdn_host
+          sub_facet.save!
+          sub_facet.update_subscription_status
+        end
+
+        unify_arf_reports(fqdn_host, short_host)
+        short_host.reload.destroy!
+      else
+        puts "#{fqdn_host.name} has a registered consumer, skipping"
+      end
+    end
+
+    def unify_arf_reports(fqdn_host, short_host)
+      if short_host.try(:arf_reports)
+        short_host.arf_reports.each do |report|
+          report.host = fqdn_host
+          report.save!
+        end
+      end
+    end
+
+    main
+  end
+end

data/lib/katello/tasks/upgrade_check.rake

@@ -11,8 +11,9 @@ namespace :katello do
 
     # check for any running tasks
     task_count = ::ForemanTasks::Task.active.where("label != '#{CP_LISTEN_ACTION}'").count
-    task_status = task_count > 1 ? fail : success
+    task_status = task_count > 0 ? fail : success
     puts "Checking for running tasks..."
-    puts "[#{task_status}] - There are #{task_count} active tasks.\n\n"
+    puts "[#{task_status}] - There are #{task_count} active tasks. "
+    puts "         Please wait for these to complete or cancel them from the Monitor tab.\n\n"
   end
 end

data/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -46,10 +46,8 @@ namespace :katello do
             subscription_facet.save!
 
             host = subscription_facet.host
-            if host.name.include?('_') || host.name != host.name.downcase
-              host.name = host.name.gsub('_', '-').downcase
-              host.save!
-            end
+            host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
+            host.save! if host.name_changed?
 
             Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
           rescue StandardError => exception

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.1.0.1".freeze
+  VERSION = "3.2.0.rc1".freeze
 end

data/lib/proxy_api/pulp.rb

@@ -11,5 +11,12 @@ module ProxyAPI
     rescue => e
       raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to detect pulp storage"))
     end
+
+    def capsule_puppet_path
+      @url += "/puppet"
+      @capsule_puppet_path ||= parse(get)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to detect puppet path"))
+    end
   end
 end

data/lib/proxy_api/pulp_node.rb

@@ -11,5 +11,12 @@ module ProxyAPI
     rescue => e
       raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to detect pulp storage"))
     end
+
+    def capsule_puppet_path
+      @url += "/puppet"
+      @capsule_puppet_path ||= parse(get)
+    rescue => e
+      raise ::ProxyAPI::ProxyException.new(url, e, N_("Unable to detect puppet path"))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.1.0.1
+  version: 3.2.0.rc1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.18
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.18
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: foreman_docker
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,9 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: qpid_messaging
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -158,7 +152,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -182,7 +176,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -192,7 +186,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -216,7 +210,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -226,7 +220,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -314,6 +308,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Content and Subscription Management plugin for Foreman
 email:
 - katello-devel@redhat.com
@@ -384,7 +406,6 @@ files:
 - app/assets/javascripts/katello/common/env_select_scroll.js
 - app/assets/javascripts/katello/common/experimental/katello-globals.module.js
 - app/assets/javascripts/katello/common/index.js
-- app/assets/javascripts/katello/common/jquery.jeditable.custominputs.js
 - app/assets/javascripts/katello/common/katello.common.js
 - app/assets/javascripts/katello/common/katello.global.js
 - app/assets/javascripts/katello/common/katello.js
@@ -405,7 +426,6 @@ files:
 - app/assets/javascripts/katello/sync_management/sync_management.js
 - app/assets/javascripts/katello/widgets/auto_complete.js
 - app/assets/javascripts/katello/widgets/env_content_view_selector.js
-- app/assets/javascripts/katello/widgets/jquery.jeditable.helpers.js
 - app/assets/javascripts/katello/widgets/path_selector.js
 - app/assets/javascripts/katello/widgets/subpanel_new.js
 - app/assets/javascripts/katello/widgets/tabs.js
@@ -425,7 +445,6 @@ files:
 - app/assets/stylesheets/katello/katello_sprites.scss
 - app/assets/stylesheets/katello/notifications.scss
 - app/assets/stylesheets/katello/widgets/_chosen.scss
-- app/assets/stylesheets/katello/widgets/_scrollpane.scss
 - app/assets/stylesheets/katello/widgets/tabs.scss
 - app/controllers/katello/api/api_controller.rb
 - app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb
@@ -444,6 +463,7 @@ files:
 - app/controllers/katello/api/v2/docker_tags_controller.rb
 - app/controllers/katello/api/v2/environments_controller.rb
 - app/controllers/katello/api/v2/errata_controller.rb
+- app/controllers/katello/api/v2/file_units_controller.rb
 - app/controllers/katello/api/v2/gpg_keys_controller.rb
 - app/controllers/katello/api/v2/host_autocomplete_controller.rb
 - app/controllers/katello/api/v2/host_collections_controller.rb
@@ -467,7 +487,6 @@ files:
 - app/controllers/katello/api/v2/subscriptions_controller.rb
 - app/controllers/katello/api/v2/sync_controller.rb
 - app/controllers/katello/api/v2/sync_plans_controller.rb
-- app/controllers/katello/api/v2/systems_controller.rb
 - app/controllers/katello/api/v2/uebercerts_controller.rb
 - app/controllers/katello/application_controller.rb
 - app/controllers/katello/auto_complete_search_controller.rb
@@ -492,25 +511,19 @@ files:
 - app/controllers/katello/remote_execution_controller.rb
 - app/controllers/katello/sort_column_list.rb
 - app/controllers/katello/sync_management_controller.rb
-- 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/hosts_and_hostgroups_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
 - app/helpers/katello/hosts_and_hostgroups_helper.rb
-- app/helpers/katello/katello_form_builder.rb
 - app/helpers/katello/katello_url_helper.rb
 - app/helpers/katello/katello_urls_helper.rb
 - app/helpers/katello/layout_helper.rb
 - app/helpers/katello/organizations_helper.rb
-- app/helpers/katello/packages_helper.rb
 - app/helpers/katello/providers_helper.rb
-- app/helpers/katello/subscriptions_helper.rb
 - app/helpers/katello/sync_management_helper.rb
-- app/helpers/katello/system_events_helper.rb
-- app/helpers/katello/system_packages_helper.rb
 - app/helpers/katello/taxonomy_helper.rb
 - app/helpers/katello/translation_helper.rb
 - app/lib/actions/abstract_async_task.rb
@@ -607,6 +620,7 @@ files:
 - app/lib/actions/katello/host/package/update.rb
 - app/lib/actions/katello/host/package_group/install.rb
 - app/lib/actions/katello/host/package_group/remove.rb
+- app/lib/actions/katello/host/reassign.rb
 - app/lib/actions/katello/host/register.rb
 - app/lib/actions/katello/host/remove_subscriptions.rb
 - app/lib/actions/katello/host/unregister.rb
@@ -631,6 +645,7 @@ files:
 - app/lib/actions/katello/repository/capsule_generate_and_sync.rb
 - app/lib/actions/katello/repository/clear.rb
 - app/lib/actions/katello/repository/clone_docker_content.rb
+- app/lib/actions/katello/repository/clone_file_content.rb
 - app/lib/actions/katello/repository/clone_ostree_content.rb
 - app/lib/actions/katello/repository/clone_to_environment.rb
 - app/lib/actions/katello/repository/clone_to_version.rb
@@ -646,12 +661,11 @@ files:
 - 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
 - app/lib/actions/katello/repository/index_errata.rb
 - app/lib/actions/katello/repository/index_package_groups.rb
 - app/lib/actions/katello/repository/metadata_generate.rb
-- app/lib/actions/katello/repository/refresh_repostiory.rb
+- app/lib/actions/katello/repository/refresh_repository.rb
 - app/lib/actions/katello/repository/remove_content.rb
 - app/lib/actions/katello/repository/sync.rb
 - app/lib/actions/katello/repository/update.rb
@@ -661,13 +675,10 @@ files:
 - app/lib/actions/katello/repository_set/disable_repository.rb
 - app/lib/actions/katello/repository_set/enable_repository.rb
 - app/lib/actions/katello/repository_set/scan_cdn.rb
-- app/lib/actions/katello/subscription/subscribe.rb
 - app/lib/actions/katello/sync_plan/add_products.rb
 - app/lib/actions/katello/sync_plan/destroy.rb
 - app/lib/actions/katello/sync_plan/remove_products.rb
 - app/lib/actions/katello/sync_plan/update.rb
-- app/lib/actions/katello/system/destroy.rb
-- app/lib/actions/katello/system/reassign.rb
 - app/lib/actions/middleware/backend_services_check.rb
 - app/lib/actions/middleware/candlepin_services_check.rb
 - app/lib/actions/middleware/execute_if_contents_changed.rb
@@ -688,6 +699,7 @@ files:
 - app/lib/actions/pulp/consumer/destroy.rb
 - app/lib/actions/pulp/consumer/generate_applicability.rb
 - app/lib/actions/pulp/consumer/sync_capsule.rb
+- app/lib/actions/pulp/consumer/unassociate_units.rb
 - app/lib/actions/pulp/consumer/update.rb
 - app/lib/actions/pulp/content_view_puppet_environment/index_content.rb
 - app/lib/actions/pulp/expect_one_task.rb
@@ -700,6 +712,7 @@ files:
 - app/lib/actions/pulp/repository/copy_docker_manifest.rb
 - app/lib/actions/pulp/repository/copy_docker_tag.rb
 - app/lib/actions/pulp/repository/copy_errata.rb
+- app/lib/actions/pulp/repository/copy_files.rb
 - app/lib/actions/pulp/repository/copy_ostree_branch.rb
 - app/lib/actions/pulp/repository/copy_package_group.rb
 - app/lib/actions/pulp/repository/copy_puppet_module.rb
@@ -727,6 +740,7 @@ files:
 - app/lib/actions/pulp/repository/remove_distribution.rb
 - app/lib/actions/pulp/repository/remove_docker_manifest.rb
 - app/lib/actions/pulp/repository/remove_errata.rb
+- app/lib/actions/pulp/repository/remove_file.rb
 - app/lib/actions/pulp/repository/remove_package_group.rb
 - app/lib/actions/pulp/repository/remove_puppet_module.rb
 - app/lib/actions/pulp/repository/remove_rpm.rb
@@ -806,7 +820,6 @@ files:
 - app/models/katello/authorization/repository.rb
 - app/models/katello/authorization/subscription.rb
 - app/models/katello/authorization/sync_plan.rb
-- app/models/katello/authorization/system.rb
 - app/models/katello/candlepin/content.rb
 - app/models/katello/candlepin/product_content.rb
 - app/models/katello/capsule_lifecycle_environment.rb
@@ -856,10 +869,10 @@ files:
 - app/models/katello/event.rb
 - app/models/katello/events/import_host_errata.rb
 - app/models/katello/ext/label_from_name.rb
+- app/models/katello/file_unit.rb
 - app/models/katello/glue.rb
 - app/models/katello/glue/candlepin/activation_key.rb
 - app/models/katello/glue/candlepin/candlepin_object.rb
-- app/models/katello/glue/candlepin/consumer.rb
 - app/models/katello/glue/candlepin/content.rb
 - app/models/katello/glue/candlepin/environment.rb
 - app/models/katello/glue/candlepin/owner.rb
@@ -868,7 +881,6 @@ files:
 - app/models/katello/glue/candlepin/product.rb
 - app/models/katello/glue/candlepin/subscription.rb
 - app/models/katello/glue/provider.rb
-- app/models/katello/glue/pulp/consumer.rb
 - app/models/katello/glue/pulp/pulp_errors.rb
 - app/models/katello/glue/pulp/repo.rb
 - app/models/katello/glue/pulp/repos.rb
@@ -879,7 +891,6 @@ files:
 - app/models/katello/host_collection.rb
 - app/models/katello/host_collection_hosts.rb
 - app/models/katello/host_installed_package.rb
-- app/models/katello/hypervisor.rb
 - app/models/katello/installed_package.rb
 - app/models/katello/key_host_collection.rb
 - app/models/katello/kt_environment.rb
@@ -899,6 +910,7 @@ files:
 - app/models/katello/repository.rb
 - app/models/katello/repository_docker_manifest.rb
 - app/models/katello/repository_erratum.rb
+- app/models/katello/repository_file.rb
 - app/models/katello/repository_ostree_branch.rb
 - app/models/katello/repository_package_group.rb
 - app/models/katello/repository_puppet_module.rb
@@ -912,9 +924,6 @@ files:
 - app/models/katello/subscription_product.rb
 - app/models/katello/subscription_status.rb
 - app/models/katello/sync_plan.rb
-- app/models/katello/system.rb
-- app/models/katello/system_activation_key.rb
-- app/models/katello/system_repository.rb
 - app/models/katello/task_status.rb
 - app/models/setting/content.rb
 - app/overrides/add_about_page.rb
@@ -924,7 +933,7 @@ files:
 - app/overrides/add_subscription_status.rb
 - app/overrides/disable_turbolinks_on_proxies_index.rb
 - app/overrides/override_taxonomy_actions.rb
-- app/presenters/katello/activation_key_subscription_presenter.rb
+- app/presenters/katello/activation_key_subscriptions_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
@@ -943,6 +952,7 @@ files:
 - app/services/katello/pulp/content_counts_calculator.rb
 - app/services/katello/pulp/docker_manifest.rb
 - app/services/katello/pulp/erratum.rb
+- app/services/katello/pulp/file_unit.rb
 - app/services/katello/pulp/ostree_branch.rb
 - app/services/katello/pulp/package_group.rb
 - app/services/katello/pulp/pulp_content_unit.rb
@@ -998,6 +1008,7 @@ files:
 - app/views/katello/api/v2/common/update.json.rabl
 - app/views/katello/api/v2/content_facet/base.json.rabl
 - app/views/katello/api/v2/content_facet/base_with_root.json.rabl
+- app/views/katello/api/v2/content_facet/erratum.json.rabl
 - app/views/katello/api/v2/content_facet/show.json.rabl
 - app/views/katello/api/v2/content_view_filter_rules/index.json.rabl
 - app/views/katello/api/v2/content_view_filter_rules/show.json.rabl
@@ -1028,12 +1039,14 @@ files:
 - app/views/katello/api/v2/environments/releases.json.rabl
 - app/views/katello/api/v2/environments/repositories.json.rabl
 - app/views/katello/api/v2/environments/show.json.rabl
-- app/views/katello/api/v2/errata/_applicable_errata.json.rabl
 - app/views/katello/api/v2/errata/_attributes.json.rabl
 - app/views/katello/api/v2/errata/_counts.json.rabl
 - app/views/katello/api/v2/errata/compare.json.rabl
 - app/views/katello/api/v2/errata/index.json.rabl
 - app/views/katello/api/v2/errata/show.json.rabl
+- app/views/katello/api/v2/file_units/base.json.rabl
+- app/views/katello/api/v2/file_units/index.json.rabl
+- app/views/katello/api/v2/file_units/show.json.rabl
 - app/views/katello/api/v2/gpg_keys/index.json.rabl
 - app/views/katello/api/v2/gpg_keys/show.json.rabl
 - app/views/katello/api/v2/host_collection_errata/index.json.rabl
@@ -1111,7 +1124,6 @@ files:
 - app/views/katello/api/v2/subscription_facet/base_with_root.json.rabl
 - app/views/katello/api/v2/subscription_facet/show.json.rabl
 - app/views/katello/api/v2/subscriptions/base.json.rabl
-- app/views/katello/api/v2/subscriptions/create.json.rabl
 - app/views/katello/api/v2/subscriptions/destroy.json.rabl
 - app/views/katello/api/v2/subscriptions/destroy_all.json.rabl
 - app/views/katello/api/v2/subscriptions/destroy_by_serial.json.rabl
@@ -1124,23 +1136,6 @@ 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/_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/enabled_repos.json.rabl
-- app/views/katello/api/v2/systems/erratum.json.rabl
-- app/views/katello/api/v2/systems/events.json.rabl
-- app/views/katello/api/v2/systems/index.json.rabl
-- 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/regenerate_identity_certificates.json.rabl
-- app/views/katello/api/v2/systems/remove_host_collections.json.rabl
-- app/views/katello/api/v2/systems/show.json.rabl
-- app/views/katello/api/v2/systems/subscriptions.json.rabl
-- app/views/katello/api/v2/systems/upload_package_profile.json.rabl
 - app/views/katello/api/v2/tasks/index.json.rabl
 - app/views/katello/api/v2/tasks/show.json.rabl
 - app/views/katello/api/v2/tasks/task_status_show.json.rabl
@@ -1344,13 +1339,18 @@ files:
 - db/migrate/20160605160933_remove_jobs.rb
 - db/migrate/20160605162929_remove_system_smart_proxy.rb
 - db/migrate/20160613150922_add_event_queue.rb
+- db/migrate/20160617124149_remove_duplicate_view_filters.rb
 - db/migrate/20160619223332_fix_viewer_role.rb
+- db/migrate/20160627125310_delete_system.rb
 - db/migrate/20160701180402_add_sortable_version_to_puppet_modules.rb
+- db/migrate/20160722193256_add_verify_ssl_on_sync_to_repository.rb
+- db/migrate/20160727144242_add_registered_through_to_katello_subscription_facets.rb
+- db/migrate/20160808002834_add_files.rb
+- db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
 - db/seeds.d/104-proxy.rb
-- db/seeds.d/105-roles_permissions.rb
 - db/seeds.d/106-mail_notifications.rb
 - db/seeds.d/107-enable_dynflow.rb
 - db/seeds.d/108-ensure_sync_notification.rb
@@ -1413,7 +1413,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-events.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-status.controller.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.module.js
@@ -1462,6 +1461,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-content-hosts.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-environments.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-docker-repositories.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-file-repositories.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-ostree-repositories.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-puppet-modules.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-repositories.controller.js
@@ -1469,6 +1469,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-composite-content-views-list.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-docker-repositories-list.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-file-repositories-list.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-ostree-repositories-list.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js
@@ -1523,6 +1524,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details-tasks.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-ostree-repositories.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-promotion.html
@@ -1539,6 +1541,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-docker.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-file.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-package-groups.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-packages.html
@@ -1636,6 +1639,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections-table-collapsed.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections-table-full.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/views/host-collections.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-erratum.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js
@@ -1663,8 +1667,18 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organizations.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organizations.routes.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/views/organization-selector.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branches-details-repositories.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branches-details.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branches-details-info.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branches-details-repositories.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branches-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branch.factory.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.module.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.routes.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches-table-collapsed.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches-table-full.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-group.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-groups.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/package-details-repositories.controller.js
@@ -1823,7 +1837,6 @@ files:
 - lib/katello/permissions.rb
 - lib/katello/permissions/activation_key_permissions.rb
 - lib/katello/permissions/capsule_content_permissions.rb
-- lib/katello/permissions/content_host_permissions.rb
 - lib/katello/permissions/content_view_permissions.rb
 - lib/katello/permissions/gpg_key_permissions.rb
 - lib/katello/permissions/host_collections_permissions.rb
@@ -1854,6 +1867,7 @@ files:
 - lib/katello/tasks/setup.rake
 - lib/katello/tasks/simplecov.rake
 - lib/katello/tasks/test.rake
+- lib/katello/tasks/unify_hosts.rake
 - lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/2.4/import_distributions.rake
 - lib/katello/tasks/upgrades/2.4/import_package_groups.rake
@@ -1864,7 +1878,6 @@ files:
 - lib/katello/tasks/upgrades/3.0/delete_docker_v1_content.rake
 - lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake
 - lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake
-- lib/katello/tasks/yard.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb
 - lib/monkeys/anemone.rb
@@ -1953,7 +1966,6 @@ files:
 - vendor/assets/stylesheets/katello/facebox.css
 - vendor/assets/stylesheets/katello/jquery-ui-1.8.11.custom.css
 - vendor/assets/stylesheets/katello/jquery.jnotify.css
-- vendor/assets/stylesheets/katello/jquery.jscrollpane.css
 - vendor/assets/stylesheets/katello/jquery.loadmask.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.filter.css
@@ -1973,12 +1985,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: ''