katello 3.0.0.rc4 → 3.0.0.rc5

data/app/models/katello/erratum.rb

@@ -82,7 +82,8 @@ module Katello
         joins("INNER JOIN #{Katello::RepositoryErratum.table_name} AS host_repo_errata ON \
           host_repo_errata.erratum_id = #{Katello::Erratum.table_name}.id").
         where("#{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_errata.repository_id")
-      query.where("#{Katello::Host::ContentFacet.table_name}.host_id" => [hosts.map(&:id)]) if hosts
+
+      query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => [hosts.map(&:id)]) if hosts
       query.uniq
     end
 

data/app/models/katello/host/content_facet.rb

@@ -3,6 +3,7 @@ module Katello
     class ContentFacet < Katello::Model
       self.table_name = 'katello_content_facets'
 
+      belongs_to :kickstart_repository, :class_name => "::Katello::Repository", :foreign_key => :kickstart_repository_id, :inverse_of => :kickstart_content_facets
       belongs_to :host, :inverse_of => :content_facet, :class_name => "::Host::Managed"
       belongs_to :content_view, :inverse_of => :content_facets, :class_name => "Katello::ContentView"
       belongs_to :lifecycle_environment, :inverse_of => :content_facets, :class_name => "Katello::KTEnvironment"
@@ -18,7 +19,7 @@ module Katello
       validates :host, :presence => true, :allow_blank => false
       validates_with Validators::ContentViewEnvironmentValidator
 
-      attr_accessible :content_view_id, :lifecycle_environment_id, :host
+      attr_accessible :content_view_id, :lifecycle_environment_id, :host, :kickstart_repository_id
 
       def update_repositories_by_paths(paths)
         paths = paths.map { |path| path.gsub('/pulp/repos/', '') }

data/app/models/katello/repository.rb

@@ -1,4 +1,5 @@
 module Katello
+  # rubocop:disable Metrics/ClassLength
   class Repository < Katello::Model
     self.include_root_in_json = false
 
@@ -62,6 +63,9 @@ module Katello
     has_many :repository_package_groups, :class_name => "Katello::RepositoryPackageGroup", :dependent => :destroy
     has_many :package_groups, :through => :repository_package_groups
 
+    has_many :kickstart_content_facets, :class_name => "Katello::Host::ContentFacet", :foreign_key => :kickstart_repository_id,
+                          :inverse_of => :kickstart_repository, :dependent => :nullify
+
     # rubocop:disable HasAndBelongsToMany
     # TODO: change this into has_many :through association
     has_and_belongs_to_many :filters, :class_name => "Katello::ContentViewFilter",
@@ -192,6 +196,28 @@ module Katello
       !(redhat?)
     end
 
+    def empty_errata
+      repository_rpm = Katello::RepositoryRpm.table_name
+      repository_errata = Katello::RepositoryErratum.table_name
+      rpm = Katello::Rpm.table_name
+      errata = Katello::Erratum.table_name
+      erratum_package = Katello::ErratumPackage.table_name
+
+      errata_with_packages = Erratum.joins(
+        "INNER JOIN #{erratum_package} on #{erratum_package}.erratum_id = #{errata}.id",
+        "INNER JOIN #{repository_errata} on #{repository_errata}.erratum_id = #{errata}.id",
+        "INNER JOIN #{rpm} on #{rpm}.filename = #{erratum_package}.filename",
+        "INNER JOIN #{repository_rpm} on #{repository_rpm}.rpm_id = #{rpm}.id").
+        where("#{repository_rpm}.repository_id" => self.id).
+        where("#{repository_errata}.repository_id" => self.id)
+
+      if errata_with_packages.any?
+        self.errata.where("#{Katello::Erratum.table_name}.id NOT IN (?)", errata_with_packages.pluck("#{errata}.id"))
+      else
+        self.errata
+      end
+    end
+
     def library_instance?
       library_instance.nil?
     end

data/app/models/katello/rhsm_fact_parser.rb

@@ -42,13 +42,17 @@ module Katello
       return nil if name.nil? || version.nil?
 
       os_name = ::Katello::Candlepin::Consumer.distribution_to_puppet_os(name)
-      if os_name
-        major, minor = version.split('.')
+      major, minor = version.split('.')
+      if os_name && !invalid_centos_os?(os_name, minor)
         os_attributes = {:major => major, :minor => minor || '', :name => os_name}
         ::Operatingsystem.find_by(os_attributes) || ::Operatingsystem.create!(os_attributes)
       end
     end
 
+    def invalid_centos_os?(name, minor_version)
+      name == 'CentOS' && minor_version.blank?
+    end
+
     #required to be defined, even if they return nil
     def domain
     end

data/app/models/setting/katello.rb

@@ -21,8 +21,8 @@ class Setting::Katello < Setting
         self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i),
         self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."), true),
         self.set('force_post_sync_actions', N_("Force post sync actions such as indexing and email even if no content was available."), false),
-        self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "on_demand"),
-        self.set('pulp_export_destination', N_("On-disk location for exported repositories"), N_("Please fill path in.")),
+        self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "immediate"),
+        self.set('pulp_export_destination', N_("On-disk location for exported repositories"), N_("/var/lib/pulp/katello-export")),
         self.set('pulp_client_key', N_("Path for ssl key used for pulp server auth"), "/etc/pki/katello/private/pulp-client.key"),
         self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"), "/etc/pki/katello/certs/pulp-client.crt"),
         self.set('remote_execution_by_default', N_("If set to true, use the remote execution over katello-agent for remote actions"), false),

data/app/overrides/add_activation_keys_input.rb

@@ -17,3 +17,13 @@ Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "hosts_update_environments_select",
                      :replace => 'erb[loud]:contains("select_f"):contains(":environment_id")',
                      :partial => 'overrides/activation_keys/host_environment_select')
+
+Deface::Override.new(:virtual_path => "common/os_selection/_operatingsystem",
+                     :name => "hosts_select_media_type",
+                     :insert_before => 'erb[loud]:contains("select_f"):contains(":medium_id")',
+                     :partial => 'overrides/activation_keys/host_media_type_select')
+
+Deface::Override.new(:virtual_path => "common/os_selection/_operatingsystem",
+                     :name => "hosts_select_synced_content",
+                     :insert_after => 'erb[loud]:contains("select_f"):contains(":medium_id")',
+                     :partial => 'overrides/activation_keys/host_synced_content_select')

data/app/views/katello/api/v2/environments/show.json.rabl

@@ -37,6 +37,7 @@ end
 
 node :permissions do |env|
   {
+    :create_lifecycle_environments => env.creatable?,
     :view_lifecycle_environments => env.readable?,
     :edit_lifecycle_environments => env.editable?,
     :destroy_lifecycle_environments => env.deletable?,

data/app/views/katello/api/v2/host_collections/copy.json.rabl

@@ -1,3 +1,3 @@
 object @resource
 
-extends "katello/api/v2/host_collections/host_collection"
+extends "katello/api/v2/host_collections/base"

data/app/views/katello/api/v2/host_collections/create.json.rabl

@@ -1,3 +1,3 @@
 object @host_collection
 
-extends "katello/api/v2/host_collections/host_collection"
+extends "katello/api/v2/host_collections/base"

data/app/views/katello/api/v2/host_collections/index.json.rabl

@@ -1,3 +1,7 @@
 object false
 
-extends "katello/api/v2/common/index"
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/host_collections/base"
+end

data/app/views/katello/api/v2/host_collections/show.json.rabl

@@ -1,3 +1,4 @@
 object @host_collection
 
-extends "katello/api/v2/host_collections/host_collection"
+extends "katello/api/v2/host_collections/base"
+attributes :host_ids

data/app/views/katello/api/v2/host_collections/update.json.rabl

@@ -1,3 +1,3 @@
 object @host_collection
 
-extends "katello/api/v2/host_collections/host_collection"
+extends "katello/api/v2/host_collections/base"

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -27,6 +27,11 @@ node :systems do |subscription|
       service_level: sys.serviceLevel,
       autoheal: sys.autoheal,
       facts: {
+        dmi: {
+          memory: {
+            size: facts['dmi.memory.size']
+          }
+        },
         memory: {
           memtotal: facts['memory.memtotal']
         },

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

@@ -3,15 +3,14 @@
     option.kt-env { margin-left: 0em; }
     option.kt-cv  { margin-left: 1em; }
 </style>
+<% spinner_path = asset_path('spinner.gif') %>
 
-<% using_hostgroups_page = @host.nil? %>
-
-<% env_select_id = using_hostgroups_page ? :hostgroup_lifecycle_environment_id : :host_lifecycle_environment_id %>
-<% env_select_name =  using_hostgroups_page ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
-<% env_select_attr = using_hostgroups_page ? 'lifecycle_environment' : 'content_facet.lifecycle_environment' %>
+<% env_select_id = using_hostgroups_page? ? :hostgroup_lifecycle_environment_id : :host_lifecycle_environment_id %>
+<% env_select_name =  using_hostgroups_page? ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
+<% env_select_attr = using_hostgroups_page? ? 'lifecycle_environment' : 'content_facet.lifecycle_environment' %>
 
 <%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do
-  if using_hostgroups_page
+  if using_hostgroups_page?
     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
@@ -19,16 +18,15 @@
   end
 end %>
 
-
-<% cv_select_id =  using_hostgroups_page ? :hostgroup_content_view_id : :host_content_view_id %>
-<% cv_select_name =  using_hostgroups_page ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
-<% cv_select_attr = using_hostgroups_page ? 'content_view' : 'content_facet.content_view' %>
+<% cv_select_id =  using_hostgroups_page? ? :hostgroup_content_view_id : :host_content_view_id %>
+<% cv_select_name =  using_hostgroups_page? ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
+<% cv_select_attr = using_hostgroups_page? ? 'content_view' : 'content_facet.content_view' %>
 <%= field(f, cv_select_attr, {:label => _("Content View")}) do
-  if using_hostgroups_page
-    select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)),
+  if using_hostgroups_page?
+    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)), :class => 'form-control',  :name => cv_select_name
+    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
   end
 end %>
 
@@ -36,7 +34,7 @@ end %>
   <input type="hidden" name="host[content_facet_attributes][id]" value="<%= @host.content_facet.try(:id) %>">
 <% end %>
 
-<% data_url = using_hostgroups_page ? environment_selected_hostgroups_path : hostgroup_or_environment_selected_hosts_path %>
+<% data_url = using_hostgroups_page? ? environment_selected_hostgroups_path : hostgroup_or_environment_selected_hosts_path %>
 <%= select_f f, :environment_id, Environment.all, :id, :to_label, {:include_blank => blank_or_inherit_f(f, :environment)},
   {:label => _("Puppet Environment"), :onchange => 'update_puppetclasses(this);', 'data-url'=> data_url,
    'data-content_puppet_match' => (@host || @hostgroup).new_record? || (@host || @hostgroup).content_and_puppet_match?,

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

@@ -0,0 +1,26 @@
+<% media_selection = using_hostgroups_page? ? use_install_media(@hostgroup) : use_install_media(@host, :selected_host_group => @hostgroup)
+   install_media_radio  = media_selection ? 'checked="checked"':''
+   synced_content_radio  = media_selection ? '' : 'checked="checked"'
+   install_media_disabled = os_media.empty? ? 'disabled = true' : ''
+
+   kickstart_options = using_hostgroups_page? ? kickstart_repository_options(@hostgroup) : kickstart_repository_options(@host, :selected_host_group => @hostgroup)
+   synced_content_disabled = kickstart_options.empty? ? 'disabled = true' : ''
+%>
+
+<div class="clear-fix" id="media_selection_section">
+  <div class="form-group ">
+     <label class="col-md-2 control-label" for="use_install_media">Media Selection</label>
+     <div class="col-md-4">
+        <label class="radio-inline">
+          <input data-media-selector="true" id="host_use_synced_content" name="media_selector" value="synced_content" type="radio" <%= synced_content_radio  %> <%= synced_content_disabled %>/> <%= _('Synced Content') %>
+        </label>
+        <label class="radio-inline">
+          <input data-media-selector="true" id="host_use_install_media" name="media_selector" value="install_media" type="radio" <%= install_media_radio  %> <%= install_media_disabled  %>/> <%= _('All Media') %>
+        </label>
+        <span class="help-block">
+          <%= _("Select the installation media that will be used to provision this host. Choose 'Synced Content' for Synced Kickstart Repositories or 'All Media' for other media.") %>
+        </span>
+      </div>
+     <span class="help-block help-inline"></span>
+  </div>
+</div>

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

@@ -0,0 +1,24 @@
+<%
+kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
+host = using_hostgroups_page? ? @hostgroup : @host
+kickstart_options = kickstart_repository_options(host, :selected_host_group => @hostgroup)
+ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id
+ks_repo_select_name =  using_hostgroups_page? ? 'hostgroup[kickstart_repository_id]' : 'host[content_facet_attributes][kickstart_repository_id]'
+ks_repo_select_attr = using_hostgroups_page? ? 'kickstart_repository' : 'content_facet.kickstart_repository'
+%>
+
+<% spinner_path = asset_path('spinner.gif') %>
+
+<%= field(f, ks_repo_select_attr, {:label => _("Synced Content")}) do
+  if using_hostgroups_page?
+    select_tag ks_repo_select_id,  view_to_options(kickstart_options, kickstart_repo_id, blank_or_inherit_with_id(f, :kickstart_repository)), :data => {"spinner_path" => spinner_path, "kickstart-repository-id" => kickstart_repo_id},
+               :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty?
+  else
+    select_tag ks_repo_select_id,  view_to_options(kickstart_options, kickstart_repo_id, blank_or_inherit_with_id(f, :kickstart_repository)), :data => {"spinner_path" => spinner_path, "kickstart-repository-id" => kickstart_repo_id}, :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty?
+  end
+end %>
+
+<script>
+  KT.hosts.set_media_selection_bindings();
+  KT.hosts.update_media_enablement();
+</script>

data/config/routes/overrides.rb

@@ -1,6 +1,6 @@
 module Katello
   class WhitelistConstraint
-    PATHS = [%r{\A/api/v2/organizations/\S+/parameters}]
+    PATHS ||= [%r{\A/api/v2/organizations/\S+/parameters}]
 
     def matches?(request)
       PATHS.map { |path| request.env["REQUEST_PATH"].match(path) }.any? ? false : true
@@ -17,15 +17,11 @@ Foreman::Application.routes.draw do
 
   match "/api/v1/organizations/:id", via: :delete, to: proc { [404, {}, [override_message]] }
 
-  resources :operatingsystems, :only => [] do
-    get 'available_kickstart_repo', :on => :member
-  end
-
   resources :hosts, :only => [] do
     get 'puppet_environment_for_content_view', :on => :collection
   end
 
-  resources :smart_proxies do
+  resources :smart_proxies, :only => [] do
     member do
       get :pulp_storage
       get :pulp_status

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -292,6 +292,11 @@ class MigrateContentHosts < ActiveRecord::Migration
 
     User.current = User.anonymous_api_admin
 
+    ping = ::Katello::Ping.ping
+    if ping[:status] != ::Katello::Ping::OK_RETURN_CODE
+      fail _("Some backend services are not running: %s") % ping.inspect
+    end
+
     ensure_one_system_per_hostname(MigrateContentHosts::System.all)
 
     systems = get_systems_with_facts(MigrateContentHosts::System.all)

data/db/migrate/20160413230128_add_kickstart_repository_to_hosts_and_hostgroups.rb

@@ -0,0 +1,9 @@
+class AddKickstartRepositoryToHostsAndHostgroups < ActiveRecord::Migration
+  def change
+    add_column :katello_content_facets, :kickstart_repository_id, :integer, :null => true
+    add_foreign_key :katello_content_facets, :katello_repositories, :column => :kickstart_repository_id
+
+    add_column :hostgroups, :kickstart_repository_id, :integer, :null => true
+    add_foreign_key :hostgroups, :katello_repositories, :column => :kickstart_repository_id
+  end
+end

data/db/migrate/20160426145517_move_host_description_to_host_comment.rb

@@ -0,0 +1,27 @@
+class MoveHostDescriptionToHostComment < ActiveRecord::Migration
+  class Host < ActiveRecord::Base
+    self.table_name = "hosts"
+  end
+
+  def up
+    Host.find_each do |host|
+      new_comment = nil
+      if host.comment.blank?
+        new_comment = host.description
+      else
+        new_comment = [host.comment, host.description].join("\n") unless host.description.empty?
+      end
+      host.update_column(:comment, new_comment) if new_comment
+    end
+
+    remove_column :hosts, :description
+  end
+
+  def down
+    add_column :hosts, :description, :text
+
+    Host.find_each do |host|
+      host.update_columns(:comment => nil, :description => host.comment)
+    end
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -19,5 +19,6 @@ BASTION_MODULES.push(
     'Bastion.sync-plans',
     'Bastion.host-collections',
     'Bastion.content-hosts',
-    'Bastion.tasks'
+    'Bastion.tasks',
+    'Bastion.settings'
 );

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

@@ -73,5 +73,8 @@
 //= require "bastion_katello/activation-keys/activation-keys.module.js"
 //= require_tree "./activation-keys"
 
+//= require "bastion_katello/settings/settings.module.js"
+//= require_tree "./settings"
+
 //= require "bastion_katello/bastion-katello-bootstrap.js"
 //= require "bastion_katello/katello-features.run.js"

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

@@ -19,7 +19,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostBaseSubscriptions
         function success() {
             $scope.subscription.workingMode = false;
             $scope.$parent.successMessages = [translate('Successfully updated subscriptions.')];
-            $scope.contentHost.$get();
+            $scope.host.$get();
         }
 
         function failure() {
@@ -33,7 +33,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostBaseSubscriptions
 
         $scope.autoAttachSubscriptions = function () {
             $scope.subscription.workingMode = true;
-            HostSubscription.autoAttach({id: $scope.contentHost.host.id}, success, failure);
+            HostSubscription.autoAttach({id: $scope.host.id}, success, failure);
         };
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html

@@ -10,7 +10,7 @@
 
       <a class="fr btn btn-default"
           ui-sref="environments.new({priorId: library.id})"
-          ng-hide="denied('create_lifecycle_environments')">
+          ng-hide="denied('create_lifecycle_environments', library)">
         <i class="fa fa-plus"></i>
         {{ "New Environment Path" | translate }}
       </a>
@@ -42,20 +42,19 @@
       <div class="col-sm-12 environment" ng-repeat="path in paths">
         <div class="row">
           <div class="col-sm-12">
-            <a ui-sref="environments.new({priorId: lastEnvironment(path).id})" class="btn btn-default fr">
+            <a ng-hide="denied('create_lifecycle_environments', path['environments'][0])" ui-sref="environments.new({priorId: lastEnvironment(path).id})" class="btn btn-default fr">
               <i class="fa fa-plus inline-icon"></i>
               <span translate>Add New Environment</span>
             </a>
           </div>
         </div>
 
-        <table class="table table-bordered environment-table">
+        <table class="table table-bordered environment-table" ng-hide="denied('view_lifecycle_environments', path.environments[0])">
           <thead>
             <tr>
               <th></th>
               <th ng-repeat="environment in path.environments">
-                <a ui-sref="environments.environment.details({environmentId: environment.id})"
-                   ng-hide="denied('create_lifecycle_environments')">
+                <a ui-sref="environments.environment.details({environmentId: environment.id})">
                   {{ environment.name }}
                 </a>
               </th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/package-details-repositories.controller.js

@@ -22,7 +22,7 @@ angular.module('Bastion.packages').controller('PackageDetailsRepositoriesControl
             'organization_id': CurrentOrganization
         };
 
-        repositoriesNutupane = new Nutupane(Repository, params, 'repositories');
+        repositoriesNutupane = new Nutupane(Repository, params);
         $scope.detailsTable = repositoriesNutupane.table;
         $scope.detailsTable.initialLoad = false;
         repositoriesNutupane.masterOnly = true;