katello 3.2.0.rc1.1 → 3.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8dee65c514ba950ad42d12bf0cd772721e54af2
-  data.tar.gz: 8daaf70daafc83d71199964d9aeb2fa654babb5d
+  metadata.gz: 1746a52c274c0de6f5d7d9bfe445688ac837f11e
+  data.tar.gz: 99ca72367e3c93ec650f2269d7438fc050aec55c
 SHA512:
-  metadata.gz: 527fc3d079158603bd6c7e79f5fabe589d18f00563268d2f0c822629862c0e9572d78063cec75a9dcf493a03e29d7aafceebc80d37e950c6694dd8f2cd9209e2
-  data.tar.gz: 1b57947ddf8cdb1b579df28450018b9fba84baa137dfa1142f28892f771127c1e2758ae4e8320dcf2baac8ee66a763685f4890f15726019c69d93481617a8cd7
+  metadata.gz: 6dd2a6dcf3602edad6b41282a2d2e5238648f718124cfc04aa8d0ca2c7258d7142c35173e85f4e048656ef7db0ce763705eb4d189f0b2b0d9dda5b12601db98e
+  data.tar.gz: b64938cda76dc55a07e01453d4c99139e79e4e33479298656efb8269fed805d76b8e07bc8e8270a89536728323e7f354f1ec2ee5ca61a220ccc6726930634b77

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -257,7 +257,7 @@ function os_selected(element){
                               'lifecycle_environment_id', 'content_source_id', 'architecture_id', 'hostgroup_id',
                               'medium_id', 'kickstart_repository_id']);
   var url = $(element).attr('data-url');
-  foreman.tools.showSpinner();
+  tfm.tools.showSpinner();
   $.ajax({
     data: attrs,
     type:'post',

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

@@ -12,6 +12,11 @@ module Katello
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
 
+    resource_description do
+      api_version 'v2'
+      api_base_url "/api"
+    end
+
     PARAM_ACTIONS = {
       :install_content => {
         :package => :install_packages,

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

@@ -22,7 +22,7 @@ module Katello
         param :user_ids, Array, N_("User IDs"), :required => false
         param :smart_proxy_ids, Array, N_("Smart proxy IDs"), :required => false
         param :compute_resource_ids, Array, N_("Compute resource IDs"), :required => false
-        param :media_ids, Array, N_("Media IDs"), :required => false
+        param :medium_ids, Array, N_("Medium IDs"), :required => false
         param :config_template_ids, Array, N_("Provisioning template IDs"), :required => false # FIXME: deprecated
         param :ptable_ids, Array, N_("Partition template IDs"), :required => false
         param :provisioning_template_ids, Array, N_("Provisioning template IDs"), :required => false

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

@@ -287,7 +287,7 @@ module Katello
 
       if !filepaths.blank?
         sync_task(::Actions::Katello::Repository::UploadFiles, @repository, filepaths)
-        render :json => {:status => "success"}
+        render :json => {:status => "success", :filenames => filepaths.map { |item| item[:filename] }}
       else
         fail HttpErrors::BadRequest, _("No file uploaded")
       end

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

@@ -39,7 +39,7 @@ module Katello
         param :id, :identifier, :required => true
         param_group :hostgroup
         def update
-          process_response @hostgroup.update_attributes(params[:hostgroup])
+          process_response @hostgroup.update_attributes(hostgroup_params)
         end
 
         api :GET, "/hostgroups/:id", N_("Show a host group")

data/app/controllers/katello/products_controller.rb

@@ -72,7 +72,7 @@ module Katello
       repos.select do |repo|
         if repo[:path].include?('kickstart')
           variants = ['Server', 'Client', 'ComputeNode', 'Workstation']
-          has_variant = variants.any? { |v| repo[:substitutions][:releasever].include?(v) }
+          has_variant = variants.any? { |v| repo[:substitutions][:releasever].try(:include?, v) }
           has_variant ? repo[:enabled] : true
         else
           true

data/app/lib/actions/katello/capsule_content/create_repos.rb

@@ -24,7 +24,7 @@ module Actions
                       content_type: repository.content_type,
                       pulp_id: repository.pulp_id,
                       name: repository.name,
-                      feed: repository.docker? ? repository.docker_feed_url(true) : repository.full_path,
+                      feed: repository.docker? ? repository.docker_feed_url(true) : repository.full_path(nil, true),
                       ssl_ca_cert: ::Cert::Certs.ca_cert,
                       ssl_client_cert: ueber_cert[:cert],
                       ssl_client_key: ueber_cert[:key],

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -74,29 +74,10 @@ module Actions
         end
 
         def repos_needing_updates(capsule_content, environment, content_view)
-          need_importer_update = repos_needing_importer_updates(capsule_content, environment, content_view)
-          need_distributor_update = repos_needing_distributor_updates(capsule_content, environment, content_view)
-          (need_distributor_update + need_importer_update).uniq
-        end
-
-        def repos_needing_distributor_updates(capsule_content, environment, content_view)
           repos = capsule_content.repos_available_to_capsule(environment, content_view)
-          repos.select do |repo|
-            repo_details = capsule_content.pulp_repo_facts(repo.pulp_id)
-            next unless repo_details
-            capsule_distributors = repo_details["distributors"]
-            !repo.distributors_match?(capsule_distributors, capsule_content.capsule)
-          end
-        end
-
-        def repos_needing_importer_updates(capsule, environment, content_view)
-          repos = capsule.repos_available_to_capsule(environment, content_view)
-          repos.select do |repo|
-            repo_details = capsule.pulp_repo_facts(repo.pulp_id)
-            next unless repo_details
-            capsule_importer = repo_details["importers"][0]
-            !repo.importer_matches?(capsule_importer)
-          end
+          need_importer_update = ::Katello::Repository.needs_importer_updates(repos, capsule_content)
+          need_distributor_update = ::Katello::Repository.needs_distributor_updates(repos, capsule_content)
+          (need_distributor_update + need_importer_update).uniq
         end
 
         def rescue_strategy

data/app/lib/actions/katello/repository/clone_to_environment.rb

@@ -12,6 +12,12 @@ module Actions
               plan_action(Repository::Create, clone, true, false)
             else
               plan_action(Repository::Clear, clone)
+              clone.copy_library_instance_attributes
+              clone.save!
+
+              if ::Katello::Repository.needs_distributor_updates([clone]).first
+                plan_action(Pulp::Repository::Refresh, clone)
+              end
             end
 
             if repository.yum?

data/app/lib/actions/katello/repository/create.rb

@@ -46,7 +46,9 @@ module Actions
             end
 
             concurrence do
-              plan_action(::Actions::Pulp::Repos::Update, repository.product) if repository.product.sync_plan
+              if !clone && repository.product.sync_plan
+                plan_action(::Actions::Pulp::Repos::Update, repository.product)
+              end
               plan_self(:repository_id => repository.id, :clone => clone)
             end
           end

data/app/lib/actions/katello/repository/destroy.rb

@@ -30,8 +30,6 @@ module Actions
             else
               handle_custom_content(repository) unless skip_environment_update
             end
-
-            plan_action(Repository::DestroyMedium, repository)
           end
 
           plan_self(:user_id => ::User.current.id, :planned_destroy => planned_destroy)

data/app/lib/actions/katello/repository/sync.rb

@@ -37,7 +37,6 @@ module Actions
             plan_action(Katello::Foreman::ContentUpdate, repo.environment, repo.content_view, repo)
             plan_action(Katello::Repository::CorrectChecksum, repo)
             concurrence do
-              plan_action(Katello::Repository::UpdateMedia, :repo_id => repo.id, :contents_changed => contents_changed)
               plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
               plan_self(:id => repo.id, :sync_result => output, :user_id => ::User.current.id, :contents_changed => contents_changed)
               plan_action(Pulp::Repository::RegenerateApplicability, :pulp_id => repo.pulp_id, :contents_changed => contents_changed)

data/app/models/katello/activation_key.rb

@@ -87,7 +87,8 @@ module Katello
       all_pools = self.get_pools.map { |pool| pool["id"] }
       added_pools = self.get_key_pools.map { |pool| pool["id"] }
       available_pools = all_pools - added_pools
-      Pool.where(:cp_id => available_pools)
+      Pool.where(:cp_id => available_pools,
+                 :subscription_id => Subscription.with_subscribable_content)
     end
 
     def products

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

@@ -23,11 +23,13 @@ module Katello
         has_many :applicable_errata, :through => :content_facet
 
         scoped_search :in => :content_view, :on => :name, :complete_value => true, :rename => :content_view
-        scoped_search :in => :content_facet, :on => :content_view_id, :rename => :content_view_id
+        scoped_search :in => :content_facet, :on => :content_view_id, :rename => :content_view_id, :only_explicit => true
         scoped_search :in => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
-        scoped_search :in => :content_facet, :on => :lifecycle_environment_id, :rename => :lifecycle_environment_id
-        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :applicable_errata, :complete_value => true, :ext_method => :find_by_applicable_errata
-        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata
+        scoped_search :in => :content_facet, :on => :lifecycle_environment_id, :rename => :lifecycle_environment_id, :only_explicit => true
+        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :applicable_errata, :complete_value => true, :ext_method => :find_by_applicable_errata, :only_explicit => true
+        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata, :only_explicit => true
+        scoped_search :in => :applicable_rpms, :on => :nvra, :rename => :applicable_rpms, :complete_value => true, :ext_method => :find_by_applicable_rpms, :only_explicit => true
+        scoped_search :in => :applicable_rpms, :on => :nvra, :rename => :upgradable_rpms, :complete_value => true, :ext_method => :find_by_installable_rpms, :only_explicit => true
 
         accepts_nested_attributes_for :content_facet, :reject_if => proc { |attributes| attributes['content_view_id'].blank? && attributes['lifecycle_environment_id'].blank? }
       end

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

@@ -21,10 +21,10 @@ module Katello
         before_save :correct_puppet_environment
 
         scoped_search :in => :content_source, :on => :name, :complete_value => true, :rename => :content_source
-        scoped_search :in => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id
+        scoped_search :in => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id, :only_explicit => true
         scoped_search :in => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection
-        scoped_search :in => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package
-        scoped_search :in => :installed_packages, :on => :name, :complete_value => true, :rename => :installed_package_name
+        scoped_search :in => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package, :only_explicit => true
+        scoped_search :in => :installed_packages, :on => :name, :complete_value => true, :rename => :installed_package_name, :only_explicit => true
       end
 
       def validate_media_with_capsule?

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

@@ -35,7 +35,9 @@ module Katello
         end
 
         def construct_name(family)
-          if family.include? 'Red Hat'
+          if family == ::Operatingsystem::REDHAT_ATOMIC_HOST_DISTRO_NAME
+            return ::Operatingsystem::REDHAT_ATOMIC_HOST_OS
+          elsif family.include? 'Red Hat'
             return 'RedHat'
           else
             return family.tr(' ', '_')

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

@@ -22,12 +22,12 @@ module Katello
         scoped_search :on => :release_version, :in => :subscription_facet, :complete_value => true
         scoped_search :on => :autoheal, :in => :subscription_facet, :complete_value => true
         scoped_search :on => :service_level, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :last_checkin, :in => :subscription_facet, :complete_value => true
+        scoped_search :on => :last_checkin, :in => :subscription_facet, :complete_value => true, :only_explicit => true
         scoped_search :on => :registered_through, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :registered_at, :in => :subscription_facet, :rename => :registered_at
+        scoped_search :on => :registered_at, :in => :subscription_facet, :rename => :registered_at, :only_explicit => true
         scoped_search :on => :uuid, :in => :subscription_facet, :rename => :subscription_uuid
         scoped_search :in => :activation_keys, :on => :name, :rename => :activation_key, :complete_value => true, :ext_method => :find_by_activation_key
-        scoped_search :in => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id
+        scoped_search :in => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id, :only_explicit => true
       end
 
       def update_action

data/app/models/katello/glue/pulp/repo.rb

@@ -57,6 +57,23 @@ module Katello
             filename.include?("vmlinuz") || filename.include?("pxeboot")
           end
         end
+
+        def self.needs_importer_updates(repos, capsule = nil)
+          repos.select do |repo|
+            repo_details = capsule ? capsule.pulp_repo_facts(repo.pulp_id) : repo.pulp_repo_facts
+            next unless repo_details
+            capsule_importer = repo_details["importers"][0]
+            !repo.importer_matches?(capsule_importer)
+          end
+        end
+
+        def self.needs_distributor_updates(repos, capsule = nil)
+          repos.select do |repo|
+            repo_details = capsule ? capsule.pulp_repo_facts(repo.pulp_id) : repo.pulp_repo_facts
+            next unless repo_details
+            !repo.distributors_match?(repo_details["distributors"], capsule)
+          end
+        end
       end
     end
 

data/app/models/katello/ping.rb

@@ -117,10 +117,6 @@ module Katello
         fail _("Pulp does not appear to be running.") if body.empty?
         json = JSON.parse(body)
 
-        if json['known_workers'].empty?
-          fail _("No pulp workers running.")
-        end
-
         if json['database_connection'] && json['database_connection']['connected'] != true
           fail _("Pulp database connection issue.")
         end
@@ -129,8 +125,21 @@ module Katello
           fail _("Pulp message bus connection issue.")
         end
 
+        unless all_pulp_workers_present?(json)
+          fail _("Not all necessary pulp workers running.")
+        end
+
         json
       end
+
+      def all_pulp_workers_present?(json)
+        worker_ids = json["known_workers"].collect { |worker| worker["_id"] }
+        return false unless worker_ids.any?
+        scheduler = worker_ids.any? { |worker| worker.include?("scheduler@") }
+        resource_manager = worker_ids.any? { |worker| worker.include?("resource_manager@") }
+        reservered_resource_worker = worker_ids.any? { |worker| worker =~ /reserved_resource_worker-./ }
+        scheduler && resource_manager && reservered_resource_worker
+      end
     end
   end
 end

data/app/models/katello/product.rb

@@ -57,6 +57,12 @@ module Katello
     scope :redhat, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => Provider::REDHAT) }
     scope :custom, -> { joins(:provider).where("#{Provider.table_name}.provider_type" => [Provider::CUSTOM, Provider::ANONYMOUS]) }
 
+    def self.with_subscribable_content
+      joins(:repositories).uniq.
+        where("#{Katello::Repository.table_name}.content_type IN (?)",
+              Repository::SUBSCRIBABLE_TYPES)
+    end
+
     def self.enabled
       self.where("#{Product.table_name}.id in (?) or #{Product.table_name}.id in (?)",
                  Product.redhat.joins(:repositories).uniq.pluck(:id), Product.custom.pluck(:id))
@@ -209,7 +215,9 @@ module Katello
     end
 
     def available_content
-      self.productContent.find_all { |content| self.repositories.where(:content_id => content.content.id).any? }
+      self.productContent.select do |content|
+        self.repositories.subscribable.where(content_id: content.content.id).exists?
+      end
     end
 
     def related_resources

data/app/models/katello/repository.rb

@@ -24,6 +24,7 @@ module Katello
     OSTREE_TYPE = 'ostree'.freeze
 
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
+    SUBSCRIBABLE_TYPES = [YUM_TYPE, OSTREE_TYPE].freeze
 
     belongs_to :environment, :inverse_of => :repositories, :class_name => "Katello::KTEnvironment"
     belongs_to :product, :inverse_of => :repositories
@@ -115,6 +116,7 @@ module Katello
     scope :non_puppet, -> { where("content_type != ?", PUPPET_TYPE) }
     scope :non_archived, -> { where('environment_id is not NULL') }
     scope :archived, -> { where('environment_id is NULL') }
+    scope :subscribable, -> { where(content_type: SUBSCRIBABLE_TYPES) }
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :rename => :product, :on => :name, :in => :product, :complete_value => true
@@ -265,6 +267,11 @@ module Katello
       end
     end
 
+    def copy_library_instance_attributes
+      self.unprotected = library_instance.unprotected
+      self.checksum_type = library_instance.checksum_type
+    end
+
     # Returns true if the pulp_task_id was triggered by the last synchronization
     # action for the repository. Dynflow action handles the synchronization
     # by it's own so no need to synchronize it again in this callback. Since the

data/app/models/katello/subscription.rb

@@ -12,6 +12,11 @@ module Katello
 
     scope :in_organization, ->(org) { where(:organization => org) }
 
+    def self.with_subscribable_content
+      joins(:products).
+        where("#{Katello::Product.table_name}.id" => Product.with_subscribable_content)
+    end
+
     def redhat?
       self.products.any? { |product| product.redhat? }
     end

data/app/views/dashboard/_content_views_widget.html.erb

@@ -12,9 +12,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th>Content View</th>
-        <th>Task</th>
-        <th>Status</th>
+        <th><%= _("Content View") %></th>
+        <th><%= _("Task") %></th>
+        <th><%= _("Status") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_errata_widget.html.erb

@@ -12,8 +12,8 @@
   <table class="table table-fixed table-striped">
     <thead>
       <tr>
-        <th>Type</th>
-        <th>Errata</th>
+        <th><%= _("Type") %></th>
+        <th><%= _("Errata") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_host_collection_widget.html.erb

@@ -12,9 +12,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th>Updates</th>
-        <th>Name</th>
-        <th>Content Hosts</th>
+        <th><%= _("Updates") %></th>
+        <th><%= _("Name") %></th>
+        <th><%= _("Content Hosts") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_subscription_status_widget.html.erb

@@ -2,31 +2,36 @@
   <%= _("Current Subscription Totals") %>
 </h4>
 
-<% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
-<% subscriptions = Katello::Subscription.in_organization(organizations).includes(:pools) %>
-<% total_active_subscriptions = organizations.map {|org| org.active_pools_count}.reduce(:+) %>
-<% total_expiring_subscriptions = subscriptions.select(&:expiring_soon?).count %>
-<% total_recently_expired_subscriptions = subscriptions.select(&:recently_expired?).count %>
+<% unless Organization.current.present? %>
+  <p class="ca"><%= _("Please select an organization to view subscription totals.") %></p>
+<% else %>
+  <% subscriptions = Katello::Subscription.in_organization([Organization.current]).includes(:pools) %>
+  <% total_active_subscriptions = Organization.current.active_pools_count %>
+  <% total_expiring_subscriptions = subscriptions.select(&:expiring_soon?).count %>
+  <% total_recently_expired_subscriptions = subscriptions.select(&:recently_expired?).count %>
+
+  <table class="table table-fixed table-striped table-bordered">
+    <thead>
+      <tr>
+        <th><%= _("Subscription Status") %></th>
+        <th><%= _("Count") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><%= _("Active Subscriptions") %></td>
+        <td style="text-align:right;"><%= total_active_subscriptions %></td>
+      </tr>
+      <tr>
+        <td><%= _("Subscriptions Expiring in 120 Days") %></td>
+        <td style="text-align:right;"><%= total_expiring_subscriptions %></td>
+      </tr>
+      <tr>
+        <td><%= _("Recently Expired Subscriptions") %></td>
+        <td style="text-align:right;"><%= total_recently_expired_subscriptions %></td>
+      </tr>
+    </tbody>
+  </table>
+<% end %>
+
 
-<table class="table table-fixed table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>Subscription Status</th>
-      <th>Count</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><%= _("Active Subscriptions") %></td>
-      <td style="text-align:right;"><%= total_active_subscriptions %></td>
-    </tr>
-    <tr>
-      <td><%= _("Subscriptions Expiring in 120 Days") %></td>
-      <td style="text-align:right;"><%= total_expiring_subscriptions %></td>
-    </tr>
-    <tr>
-      <td><%= _("Recently Expired Subscriptions") %></td>
-      <td style="text-align:right;"><%= total_recently_expired_subscriptions %></td>
-    </tr>
-  </tbody>
-</table>

data/app/views/dashboard/_subscription_widget.html.erb

@@ -2,58 +2,61 @@
   <%= _("Content Host Subscription Status") %>
 </h4>
 
-<% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
-<% owner_infos = organizations.map(&:owner_info) %>
-<% invalid_consumer_count = owner_infos.map(&:total_invalid_compliance_consumers).reduce(:+) %>
-<% partial_consumer_count = owner_infos.map(&:total_partial_compliance_consumers).reduce(:+) %>
-<% valid_consumer_count = owner_infos.map(&:total_valid_compliance_consumers).reduce(:+) %>
-<% total_count = owner_infos.map(&:total_consumers).reduce(:+) %>
+<% unless Organization.current.present? %>
+  <p class="ca"><%= _("Please select an organization to view subscription status.") %></p>
+<% else %>
+  <% owner_info = Organization.current.owner_info %>
+  <% invalid_consumer_count = owner_info.total_invalid_compliance_consumers %>
+  <% partial_consumer_count = owner_info.total_partial_compliance_consumers %>
+  <% valid_consumer_count = owner_info.total_valid_compliance_consumers %>
+  <% total_count = owner_info.total_consumers %>
 
-<table class="table table-fixed table-striped table-bordered">
-  <thead>
-    <tr>
-      <th></th>
-      <th>Count</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <%= link_to('/content_hosts?search=subscription_status=invalid') do %>
-          <i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Invalid") %>
-        <% end %>
-      </td>
-      <td style="text-align:right">
-        <%= link_to( "#{invalid_consumer_count}", '/content_hosts?search=subscription_status=invalid')%>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <%= link_to('/content_hosts?search=subscription_status=partial') do %>
-          <i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Partial") %>
-        <% end %>
-      </td>
-      <td style="text-align:right">
-        <%= link_to( "#{partial_consumer_count}", '/content_hosts?search=subscription_status=partial')%>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <%= link_to('/content_hosts?search=subscription_status=valid') do %>
-          <i class="label label-success" style="margin-right: 6px">&nbsp;</i><%= _("Valid") %>
-        <% end %>
-      </td>
-      <td style="text-align:right">
-        <%= link_to( "#{valid_consumer_count}", '/content_hosts?search=subscription_status=valid')%>
-      </td>
-    </tr>
-    <tr>
-      <td><h4>
-          <%= link_to("Total Content Hosts", '/content_hosts')%>
-      </h4></td>
-      <td style="text-align:right;">
-        <%= link_to( "#{total_count}", '/content_hosts')%>
-      </td>
-    </tr>
-  </tbody>
-</table>
+  <table class="table table-fixed table-striped table-bordered">
+    <thead>
+      <tr>
+        <th></th>
+        <th><%= _("Count") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          <%= link_to('/content_hosts?search=subscription_status=invalid') do %>
+            <i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Invalid") %>
+          <% end %>
+        </td>
+        <td style="text-align:right">
+          <%= link_to( "#{invalid_consumer_count}", '/content_hosts?search=subscription_status=invalid')%>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <%= link_to('/content_hosts?search=subscription_status=partial') do %>
+            <i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Partial") %>
+          <% end %>
+        </td>
+        <td style="text-align:right">
+          <%= link_to( "#{partial_consumer_count}", '/content_hosts?search=subscription_status=partial')%>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <%= link_to('/content_hosts?search=subscription_status=valid') do %>
+            <i class="label label-success" style="margin-right: 6px">&nbsp;</i><%= _("Valid") %>
+          <% end %>
+        </td>
+        <td style="text-align:right">
+          <%= link_to( "#{valid_consumer_count}", '/content_hosts?search=subscription_status=valid')%>
+        </td>
+      </tr>
+      <tr>
+        <td><h4>
+            <%= link_to("Total Content Hosts", '/content_hosts')%>
+        </h4></td>
+        <td style="text-align:right;">
+          <%= link_to( "#{total_count}", '/content_hosts')%>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+<% end %>

data/app/views/dashboard/_sync_widget.html.erb

@@ -14,9 +14,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th>Product</th>
-        <th>Status</th>
-        <th>Finished</th>
+        <th><%= _("Product") %></th>
+        <th><%= _("Status") %></th>
+        <th><%= _("Finished") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/foreman/unattended/finish-katello.erb

@@ -22,6 +22,7 @@ service network restart
   pm_set = @host.puppetmaster.empty? ? false : true
   puppet_enabled = pm_set || @host.params['force-puppet']
   salt_enabled = @host.params['salt_master'] ? true : false
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
 %>
 
 <%= snippet "subscription_manager_registration" %>
@@ -44,29 +45,16 @@ yum -t -y -e 0 update
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<% if salt_enabled %>
-yum -t -y -e 0 install salt-minion
-cat > /etc/salt/minion << EOF
-<%= snippet 'saltstack_minion' %>
-EOF
-# Setup salt-minion to run on system reboot
-/sbin/chkconfig --level 345 salt-minion on
-# Running salt-call to trigger key signing
-salt-call --no-color --grains >/dev/null
+<% if chef_enabled %>
+<%= snippet 'chef_client' %>
 <% end -%>
 
 <% if puppet_enabled %>
-yum -t -y -e 0 install puppet
-echo "Configuring puppet"
-cat > /etc/puppet/puppet.conf << EOF
-<%= snippet 'puppet.conf' %>
-EOF
-
-# Setup puppet to run on system reboot
-/sbin/chkconfig --level 345 puppet on
+<%= snippet 'puppet_setup' %>
+<% end -%>
 
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag <%= @host.puppetmaster.blank? ? '' : "--server #{@host.puppetmaster}" %> --no-daemonize
-/sbin/service puppet start
+<% if salt_enabled %>
+<%= snippet 'saltstack_setup' %>
 <% end -%>
 
 exit 0

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -18,6 +18,7 @@ oses:
   pm_set = @host.puppetmaster.empty? ? false : true
   puppet_enabled = pm_set || @host.params['force-puppet']
   salt_enabled = @host.params['salt_master'] ? true : false
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
   section_end = (rhel_compatible && os_major <= 5) ? '' : '%end'
 %>
 install
@@ -113,30 +114,16 @@ yum -t -y -e 0 update
 
 <%= snippet('remote_execution_ssh_keys') %>
 
-<% if salt_enabled %>
-yum -t -y -e 0 install salt-minion
-cat > /etc/salt/minion << EOF
-<%= snippet 'saltstack_minion' %>
-EOF
-# Setup salt-minion to run on system reboot
-/sbin/chkconfig --level 345 salt-minion on
-# Running salt-call to trigger key signing
-salt-call --no-color --grains >/dev/null
+<% if chef_enabled %>
+<%= snippet 'chef_client' %>
 <% end -%>
 
 <% if puppet_enabled %>
-# and add the puppet package
-yum -t -y -e 0 install puppet
-
-echo "Configuring puppet"
-cat > /etc/puppet/puppet.conf << EOF
-<%= snippet 'puppet.conf' %>
-EOF
-
-# Setup puppet to run on system reboot
-/sbin/chkconfig --level 345 puppet on
+<%= snippet 'puppet_setup' %>
+<% end -%>
 
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag <%= @host.puppetmaster.blank? ? '' : "--server #{@host.puppetmaster}" %> --no-daemonize
+<% if salt_enabled %>
+<%= snippet 'saltstack_setup' %>
 <% end -%>
 
 sync

data/app/views/foreman/unattended/userdata-katello.erb

@@ -63,31 +63,24 @@ write_files:
   pm_set = @host.puppetmaster.empty? ? false : true
   puppet_enabled = non_atomic && (pm_set || @host.params['force-puppet'])
   salt_enabled = non_atomic && (@host.params['salt_master'] ? true : false)
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
 %>
-<% if salt_enabled %>
-    yum -t -y -e 0 install salt-minion
-    cat > /etc/salt/minion << EOF
-    <%= indent 4 do
-          snippet 'saltstack_minion'
-        end %>
-    EOF
-    # Setup salt-minion to run on system reboot
-    /sbin/chkconfig --level 345 salt-minion on
-    # Running salt-call to trigger key signing
-    salt-call --no-color --grains >/dev/null
+<% if chef_enabled %>
+<%= indent 4 do
+      snippet 'chef_client'
+    end  %>
 <% end -%>
+
 <% if puppet_enabled %>
-    yum install -y puppet
-    cat > /etc/puppet/puppet.conf << EOF
-    <%= indent 4 do
-          snippet 'puppet.conf'
-        end %>
-    EOF
-    # Setup puppet to run on system reboot
-    /sbin/chkconfig --level 345 puppet on
+<%= indent 4 do
+      snippet 'puppet_setup'
+    end %>
+<% end -%>
 
-    /usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag <%= @host.puppetmaster.blank? ? '' : "--server #{@host.puppetmaster}" %> --no-daemonize
-    /sbin/service puppet start
+<% if salt_enabled %>
+<%= indent 4 do
+      snippet 'saltstack_setup'
+    end %>
 <% end -%>
 phone_home:
  url: <%= foreman_url('built') %>

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -14,7 +14,7 @@
     select_tag env_select_id, lifecycle_environment_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)),
                :class => 'form-control',  :name => env_select_name
   else
-    select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name
+    select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name
   end
 end %>
 
@@ -26,7 +26,7 @@ end %>
     select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path},
                :class => 'form-control',  :name => cv_select_name
   else
-    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name
+    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name
   end
 end %>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -64,7 +64,7 @@
       </div>
 
         <span bst-feature-flag="remote_actions">
-          <span class="input-group-btn">
+          <span class="btn-group" uib-dropdown>
             <button class="btn btn-primary"
                     translate
                     ng-hide="denied('edit_hosts', host)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html

@@ -7,7 +7,7 @@
   </h3>
 
   <nav>
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
       <li ng-class="{active: isState('content-views.details.repositories.docker.list')}">
         <a ui-sref="content-views.details.repositories.docker.list">
           <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html

@@ -7,7 +7,7 @@
   </h3>
 
   <nav>
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
       <li ng-class="{active: isState('content-views.details.repositories.file.list')}">
         <a ui-sref="content-views.details.repositories.file.list">
           <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-ostree-repositories.html

@@ -7,7 +7,7 @@
   </h3>
 
   <nav>
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
       <li ng-class="{active: isState('content-views.details.repositories.ostree.list')}">
         <a ui-sref="content-views.details.repositories.ostree.list">
           <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-repositories.html

@@ -7,7 +7,7 @@
   </h3>
 
   <nav>
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
       <li ng-class="{active: isState('content-views.details.repositories.yum.list')}">
         <a ui-sref="content-views.details.repositories.yum.list">
           <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repositories/details/repository-details-info.controller.js

@@ -81,7 +81,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
         };
 
         $scope.uploadContent = function (content) {
-            var returnData, error;
+            var returnData, error, uploaded;
 
             if (content) {
                 try {
@@ -95,7 +95,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 }
 
                 if (returnData !== null && returnData.status === 'success') {
-                    $scope.uploadSuccessMessages = [translate('Content successfully uploaded')];
+                    uploaded = returnData.filenames.join(', ');
+                    $scope.uploadSuccessMessages = [translate('Successfully uploaded content: ') + uploaded];
                     $scope.repository.$get();
                     updateRepositoriesTable();
                 } else {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-products.controller.js

@@ -18,7 +18,9 @@ angular.module('Bastion.subscriptions').controller('SubscriptionProductsControll
 
         Product.queryUnpaged({'organization_id': CurrentOrganization,
                               'subscription_id': $scope.$stateParams.subscriptionId,
-                              enabled: true
+                              enabled: true,
+                              'full_result': true,
+                              'include_available_content': true
                              }, function (response) {
             $scope.products = response.results;
             $scope.displayArea.working = false;

data/lib/katello/engine.rb

@@ -172,7 +172,6 @@ module Katello
       ::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
       ::Hostgroup.send :include, Katello::Concerns::HostgroupExtensions
       ::Location.send :include, Katello::Concerns::LocationExtensions
-      ::Medium.send :include, Katello::Concerns::MediumExtensions
       ::Redhat.send :include, Katello::Concerns::RedhatExtensions
       ::Operatingsystem.send :include, Katello::Concerns::OperatingsystemExtensions
       ::Organization.send :include, Katello::Concerns::OrganizationExtensions

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1.1
+  version: 3.2.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -653,7 +653,6 @@ files:
 - app/lib/actions/katello/repository/correct_checksum.rb
 - app/lib/actions/katello/repository/create.rb
 - app/lib/actions/katello/repository/destroy.rb
-- app/lib/actions/katello/repository/destroy_medium.rb
 - app/lib/actions/katello/repository/discover.rb
 - app/lib/actions/katello/repository/errata_mail.rb
 - app/lib/actions/katello/repository/export.rb
@@ -669,7 +668,6 @@ files:
 - app/lib/actions/katello/repository/remove_content.rb
 - app/lib/actions/katello/repository/sync.rb
 - app/lib/actions/katello/repository/update.rb
-- app/lib/actions/katello/repository/update_media.rb
 - app/lib/actions/katello/repository/upload_errata.rb
 - app/lib/actions/katello/repository/upload_files.rb
 - app/lib/actions/katello/repository_set/disable_repository.rb
@@ -830,7 +828,6 @@ files:
 - app/models/katello/concerns/host_managed_extensions.rb
 - app/models/katello/concerns/hostgroup_extensions.rb
 - app/models/katello/concerns/location_extensions.rb
-- app/models/katello/concerns/medium_extensions.rb
 - app/models/katello/concerns/operatingsystem_extensions.rb
 - app/models/katello/concerns/organization_extensions.rb
 - app/models/katello/concerns/pulp_database_unit.rb
@@ -1354,7 +1351,6 @@ 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
@@ -1990,7 +1986,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: ''

data/app/lib/actions/katello/repository/destroy_medium.rb

@@ -1,12 +0,0 @@
-module Actions
-  module Katello
-    module Repository
-      class DestroyMedium < Actions::Base
-        def plan(repo)
-          medium = Medium.find_medium(repo)
-          medium.destroy! if medium
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/katello/repository/update_media.rb

@@ -1,17 +0,0 @@
-module Actions
-  module Katello
-    module Repository
-      class UpdateMedia < Actions::Base
-        input_format do
-          param :repo_id
-          param :contents_changed
-        end
-
-        def finalize
-          repo = ::Katello::Repository.find(input[:repo_id])
-          Medium.update_media(repo)
-        end
-      end
-    end
-  end
-end

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

@@ -1,79 +0,0 @@
-module Katello
-  module Concerns
-    module MediumExtensions
-      extend ActiveSupport::Concern
-
-      def destroy!
-        unless destroy
-          fail self.errors.full_messages.join('; ')
-        end
-      end
-
-      module ClassMethods
-        def update_media(repo)
-          return if repo.puppet?
-
-          medium_path = ::Medium.installation_media_path(repo.uri)
-
-          if (distribution = repo.distribution_bootable?)
-            return if ::Medium.find_by(:path => medium_path)
-
-            os = ::Redhat.find_or_create_operating_system(repo)
-
-            arch = ::Architecture.where(:name => repo.distribution_arch).first_or_create!
-            os.architectures << arch unless os.architectures.include?(arch)
-
-            medium_name = ::Medium.construct_name(repo, distribution)
-            medium = ::Medium.find_or_create_medium(repo.organization, medium_name, medium_path)
-            os.media << medium
-
-            os.save!
-
-          else
-            if (medium = ::Medium.find_by(:path => medium_path))
-              medium.destroy
-            end
-          end
-        end
-
-        def find_or_create_medium(org, medium_name, medium_path)
-          params = { :name => medium_name, :path => medium_path,
-                     :os_family => 'Redhat' }
-
-          medium = ::Medium.joins(:organizations).where(params).where("taxonomies.id in (?)", [org.id]).first
-          medium = ::Medium.create!(params.merge(:organization_ids => [org.id])) unless medium
-
-          return medium
-        end
-
-        def find_medium(repo)
-          path = ::Medium.installation_media_path(repo.uri)
-          ::Medium.find_by(:path => path)
-        end
-
-        def construct_name(repo, _distribution)
-          parts = [repo.organization.label, repo.environment.label]
-          if repo.content_view && !repo.content_view.default?
-            parts << repo.content_view.label
-          end
-          parts << repo.product.label
-          parts << repo.label
-          return normalize_name(parts.compact.join('/'))
-        end
-
-        # Foreman and Puppet uses RedHat name for Red Hat Enterprise Linux
-        def normalize_name(name)
-          name.sub('Red_Hat_Enterprise_Linux', 'Red_Hat')
-        end
-
-        # takes repo uri from Katello and makes installation media url
-        # suitable for provisioning from it
-        def installation_media_path(repo_uri)
-          path = repo_uri.sub(/\Ahttps/, 'http')
-          path << "/" unless path.end_with?('/')
-          return path
-        end
-      end
-    end
-  end
-end

data/db/seeds.d/109-atomic_os.rb

@@ -1,11 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
-#
-
-::User.current = ::User.anonymous_api_admin
-os_attributes = {:major => "7", :minor => "2", :name => ::Operatingsystem::REDHAT_ATOMIC_HOST_OS}
-Operatingsystem.where(os_attributes).first_or_create!
-
-::User.current = nil