katello 3.0.0.rc1 → 3.0.0.rc2

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

@@ -9,7 +9,7 @@
 <% if errata.empty? %>
   <p class="ca"><%= _("There are no errata that need to be applied to registered content hosts.") %></p>
 <% else %>
-  <table class="table table-striped ellipsis">
+  <table class="table table-fixed table-striped">
     <thead>
       <tr>
         <th>Type</th>

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

@@ -9,7 +9,7 @@
 <% if host_collections.empty? %>
   <p class="ca"><%= _("No host collections found.") %></p>
 <% else %>
-  <table class="table table-striped ellipsis table-bordered">
+  <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
         <th>Updates</th>
@@ -29,7 +29,7 @@
               <a href="/host_collections/<%= host_collection.id %>/actions" style="text-align: center"><i class="label label-success">&nbsp;</i></a>
             <% end %>
           </td>
-          <td><%= host_collection.name %></td>
+          <td class='ellipsis'><%= host_collection.name %></td>
           <td style="text-align: right"><%= host_collection.hosts.length %></td>
         </tr>
       <% end %>

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

@@ -3,12 +3,12 @@
 </h4>
 
 <% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
-<% subscriptions = organizations.collect { |org| Katello::Pool.in_org(org.id) }.flatten %>
-<% total_active_subscriptions = Katello::Pool.active(subscriptions).count %>
-<% total_expiring_subscriptions = Katello::Pool.expiring_soon(subscriptions).count %>
-<% total_recently_expired_subscriptions = Katello::Pool.recently_expired(subscriptions).count %>
+<% subscriptions = Katello::Subscription.in_organization(organizations).includes(:pools) %>
+<% total_active_subscriptions = subscriptions.select(&:active?).count %>
+<% total_expiring_subscriptions = subscriptions.select(&:expiring_soon?).count %>
+<% total_recently_expired_subscriptions = subscriptions.select(&:recently_expired?).count %>
 
-<table class="table table-striped ellipsis table-bordered">
+<table class="table table-fixed table-striped table-bordered">
   <thead>
     <tr>
       <th>Subscription Status</th>

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

@@ -9,7 +9,7 @@
 <% valid_consumer_count = owner_infos.map(&:total_valid_compliance_consumers).reduce(:+) %>
 <% total_count = owner_infos.map(&:total_consumers).reduce(:+) %>
 
-<table class="table table-striped ellipsis table-bordered">
+<table class="table table-fixed table-striped table-bordered">
   <thead>
     <tr>
       <th></th>

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

@@ -11,7 +11,7 @@
 <% if products.empty? %>
   <p class="ca"><%= _("No recently synced products") %></p>
 <% else %>
-  <table class="table table-striped ellipsis table-bordered">
+  <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
         <th>Product</th>
@@ -22,7 +22,7 @@
     <tbody>
       <% products.each do |product| %>
         <tr>
-          <td><%= product.name %></td>
+          <td class='ellipsis'><%= product.name %></td>
           <td><%= product.sync_status[:state] %></td>
           <td><%= product.sync_status[:finish_time] %></td>
         </tr>

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

@@ -60,6 +60,8 @@ cat > /etc/puppet/puppet.conf << EOF
 <%= snippet 'puppet.conf' %>
 EOF
 
+<%= snippet('remote_execution_ssh_keys') %>
+
 # Setup puppet to run on system reboot
 /sbin/chkconfig --level 345 puppet on
 

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

@@ -0,0 +1,42 @@
+<%#
+kind: provision
+name: Katello Atomic Kickstart default
+%>
+
+lang <%= @host.params['lang'] || 'en_US.UTF-8' %>
+keyboard <%= @host.params['keyboard'] || 'us' %>
+timezone --utc <%= @host.params['time-zone'] || 'UTC' %>
+
+# Partition table should create /boot and a volume atomicos
+<% if @dynamic -%>
+%include /tmp/diskpart.cfg
+<% else -%>
+<%= @host.diskLayout %>
+<% end -%>
+
+bootloader --timeout=3
+text
+
+<% if @host.os.name.match /.*fedora.*/i -%>
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=<%= @host.param_true?('atomic-upstream') ? "https://dl.fedoraproject.org/pub/fedora/linux/atomic/#{@host.os.major}/" : "#{@host.operatingsystem.medium_uri(@host)}/content/repo/" %> --ref=fedora-atomic/f<%= @host.os.major %>/<%= @host.architecture %>/docker-host
+<% elsif @host.os.name.match /.*centos.*/i -%>
+ostreesetup --nogpg --osname=centos-atomic-host --remote=centos-atomic-host --url=<%= @host.param_true?('atomic-upstream') ? "http://mirror.centos.org/centos/#{@host.os.major}/atomic/#{@host.architecture}/repo/" : @host.operatingsystem.medium_uri(@host) %> --ref=centos-atomic-host/<%= @host.os.major %>/<%= @host.architecture %>/standard
+<% else -%>
+ostreesetup --nogpg --osname=rhel-atomic-host --remote=rhel-atomic-host --url=file:///install/ostree --ref=rhel-atomic-host/<%= @host.os.major %>/<%= @host.architecture %>/standard
+<% end -%>
+services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local
+rootpw --iscrypted <%= root_pass %>
+
+reboot
+
+%post
+<%= snippet "subscription_manager_registration" %>
+<%= snippet('remote_execution_ssh_keys') %>
+(
+# Report success back to Foreman
+curl -s -o /dev/null --insecure <%= foreman_url %>
+) 2>&1 | tee /mnt/sysimage/root/install.post.log
+
+exit 0
+
+%end

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

@@ -131,6 +131,8 @@ cat > /etc/puppet/puppet.conf << EOF
 <%= snippet 'puppet.conf' %>
 EOF
 
+<%= snippet('remote_execution_ssh_keys') %>
+
 # Setup puppet to run on system reboot
 /sbin/chkconfig --level 345 puppet on
 

data/app/views/foreman/unattended/snippets/_subscription_manager_registration.erb

@@ -1,12 +1,18 @@
 <% if @host.params['kt_activation_keys'] %>
-# add subscription manager
-yum -t -y -e 0 install subscription-manager
-rpm -ivh <%= subscription_manager_configuration_url(@host) %>
+  # add subscription manager
+ <% if @host.operatingsystem.name.match(/.*atomic.*/i) %>
+  curl -s <%= subscription_manager_configuration_url(@host, false) %> | IS_ATOMIC=true bash
+ <% else %>
+  yum -t -y -e 0 install subscription-manager
+  rpm -ivh <%= subscription_manager_configuration_url(@host) %>
+ <% end %>
 
-echo "Registering the System"
-subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= @host.params['kt_activation_keys'] %>"
+  echo "Registering the System"
+  subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= @host.params['kt_activation_keys'] %>"
 
-echo "Installing Katello Agent"
-yum -t -y -e 0 install katello-agent
-chkconfig goferd on
-<% end %>
+  <% unless @host.operatingsystem.name.match(/.*atomic.*/i) %>
+    echo "Installing Katello Agent"
+    yum -t -y -e 0 install katello-agent
+    chkconfig goferd on
+  <% end %>
+<% end %>

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

@@ -12,10 +12,15 @@ hostname: <%= @host.shortname %>
 fqdn: <%= @host %>
 manage_etc_hosts: true
 <%# Allow user to specify additional SSH key as host paramter -%>
-<% if @host.params['sshkey'] -%>
+<% if @host.params['sshkey'].present? || @host.params['remote_execution_ssh_keys'].present? -%>
 ssh_authorized_keys:
+<% if @host.params['sshkey'].present? -%>
   - <%= @host.params['sshkey'] %>
 <% end -%>
+<% @host.params['remote_execution_ssh_keys'].each do |key| -%>
+  - <%= key %>
+<% end -%>
+<% end -%>
 write_files:
 - path: /tmp/foreman-userdata.sh
   permissions: '0755'

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

@@ -1,6 +1,6 @@
 object @resource
 
-attributes :id, :name, :description, :unlimited_content_hosts, :auto_attach
+attributes :id, :name, :description, :unlimited_hosts, :auto_attach
 
 extends 'katello/api/v2/common/org_reference'
 
@@ -15,7 +15,7 @@ child :environment => :environment do
 end
 attributes :environment_id
 
-attributes :usage_count, :user_id, :max_content_hosts, :system_template_id, :release_version,
+attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version,
            :service_level, :auto_attach
 
 child :products => :products do |_product|

data/app/views/katello/api/v2/common/_metadata.json.rabl

@@ -4,6 +4,7 @@ node(:total)    { @collection[:total] }
 node(:subtotal) { @collection[:subtotal] }
 node(:page)     { @collection[:page] }
 node(:per_page) { @collection[:per_page] }
+node(:error)    { @collection[:error] }
 node(:search)   { params[:search] }
 node(:sort) do
   {

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

@@ -16,6 +16,10 @@ child :content_facet => :content do
   node :lifecycle_environment_library? do |content_facet|
     content_facet.lifecycle_environment.library?
   end
+
+  node :katello_agent_installed do |content_facet|
+    content_facet.katello_agent_installed?
+  end
 end
 
 child :host_collections => :host_collections do

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

@@ -0,0 +1,3 @@
+object false
+
+extends "katello/api/v2/host_subscriptions/product_content"

data/app/views/katello/api/v2/{systems/_content.json.rabl → host_subscriptions/product_content.json.rabl}

@@ -11,7 +11,5 @@ child @collection[:results] => :results do
     attributes :id, :name, :label
   end
 
-  node :override do |pc|
-    pc.content_override(@system)
-  end
+  attributes :enabled_override, :enabled
 end

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

@@ -2,7 +2,7 @@ object @resource
 
 attributes :id, :organization_id
 attributes :name, :description
-attributes :sync_date, :interval, :next_sync
+attributes :interval, :next_sync
 attributes :created_at, :updated_at
 attributes :enabled
 
@@ -26,3 +26,7 @@ node :permissions do |sync_plan|
     :destroy_sync_plans => sync_plan.deletable?
   }
 end
+
+node :sync_date do |sync_plan|
+  sync_plan.plan_date_time
+end

data/app/views/katello/errata_mailer/host_errata.html.erb

@@ -18,7 +18,7 @@
           <tr>
             <td align="center" valign="top">
               <div align="left">
-                <h2 style="font-weight: normal;"><b>KATELLO</b> <%= _("Host Advisory").upcase %></h2>
+                <h2 style="font-weight: normal;"><b>HOST</b> <%= _("ERRATA ADVISORY").upcase %></h2>
               </div>
               <table border="0" width="100%" id="emailHeader" style="background-color: #e1e2e3;" bgcolor="#e1e2e3">
                 <tr>
@@ -48,7 +48,7 @@
                           <th style="border-collapse: collapse; background-image: linear-gradient(#f5f5f5, #e8e8e8); text-align: center; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Bugfix") %></th>
                           <th style="border-collapse: collapse; background-image: linear-gradient(#f5f5f5, #e8e8e8); text-align: center; padding: 4px; border: 1px solid #cccccc;" align="center"><%= _("Enhancement") %></th>
                         </tr>
-                        <% hosts.each do |host| %>
+                        <% hosts.sort.each do |host| %>
                           <tr>
                             <td style="text-align: left; border-collapse: collapse; background-color: #FFFFFF; padding: 4px; border: 1px solid #cccccc;" width="48%" align="left" bgcolor="#FFFFFF"><%= link_to host, content_host_errata_path(host) %></td>
                             <td width="18%" style="border-collapse: collapse; text-align: center; background-color: #FFFFFF; padding: 4px; border: 1px solid #cccccc;" align="center" bgcolor="#FFFFFF"><%= errata_count(host, :security) %></td>

data/app/views/katello/errata_mailer/promote_errata.html.erb

@@ -18,7 +18,7 @@
           <tr>
             <td align="center" valign="top">
               <div align="left">
-                <h2 style="font-weight: normal;"><b>KATELLO</b> PROMOTION SUMMARY</h2>
+                <h2 style="font-weight: normal;"><%= _("<b>PROMOTION</b> SUMMARY") %></h2>
 
                 <%= (_("The promotion of %{content_view} to <b>%{environment}</b> has completed.  %{count} needed errata are installable on your hosts.") %
                      {:content_view         => link_to(@content_view.name, content_view_path(@content_view)),

data/app/views/katello/errata_mailer/promote_errata.text.erb

@@ -1,4 +1,4 @@
-<%= _("Katello Promotion Summary") %>
+<%= _("Promotion Summary") %>
 
 <%= (_("The promotion of %{content_view} to %{environment} has completed.  %{count} errata are available to your hosts.") %
       {:content_view         => @content_view.name,

data/app/views/katello/errata_mailer/sync_errata.html.erb

@@ -18,7 +18,7 @@
           <tr>
             <td align="center" valign="top">
               <div align="left">
-                <h2 style="font-weight: normal;"><b>KATELLO</b> SYNC SUMMARY</h2>
+                <h2 style="font-weight: normal;"><%= _("<b>SYNC</b> SUMMARY") %></h2>
                 <p><%= _("The synchronization of \"%s\" has completed.  Below is a summary of new errata.") % @repo.name %>
                    <% if @errata_counts[:total] > 100 %>
                      <%= _("A large number of errata were synced for this repository, so only the first 100 are shown.") %>

data/app/views/katello/errata_mailer/sync_errata.text.erb

@@ -1,4 +1,4 @@
-<%= _("Katello Sync Summary") %>
+<%= _("Sync Summary") %>
 
 <%= _("The synchronization of \"%s\" has completed.  Below is a summary of new errata.") % @repo.name %>
 <% if @errata_counts[:total] > 100 %>

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

@@ -4,29 +4,39 @@
     option.kt-cv  { margin-left: 1em; }
 </style>
 
-<% env_select_id =  @hostgroup ? :hostgroup_lifecycle_environment_id : :host_lifecycle_environment_id %>
-<% env_select_name =  @hostgroup ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
-<% env_select_attr = @hostgroup ? 'lifecycle_environment' : 'content_facet.lifecycle_environment' %>
+<% 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' %>
 
 <%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do
-  select_tag env_select_id, lifecycle_environment_options(@host || @hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)),
-             :class => 'form-control',  :name => env_select_name
+  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
+    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
+  end
 end %>
 
 
-<% cv_select_id =  @hostgroup ? :hostgroup_content_view_id : :host_content_view_id %>
-<% cv_select_name =  @hostgroup ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
-<% cv_select_attr = @hostgroup ? '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
-  select_tag cv_select_id,  content_views_for_host(@host || @hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)),
-             :class => 'form-control',  :name => cv_select_name
+  if using_hostgroups_page
+    select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)),
+               :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
+  end
 end %>
 
 <% if @host %>
   <input type="hidden" name="host[content_facet_attributes][id]" value="<%= @host.content_facet.try(:id) %>">
 <% end %>
 
-<% data_url = @hostgroup ? 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/config/katello.yaml.example

@@ -12,6 +12,7 @@
   :redhat_repository_url: https://cdn.redhat.com
 
   :consumer_cert_rpm: 'katello-ca-consumer-latest.noarch.rpm'
+  :consumer_cert_sh:  'katello-rhsm-consumer'
 
   # Setup your candlepin environment here
   :candlepin:

data/config/routes/api/v2.rb

@@ -240,13 +240,7 @@ Katello::Engine.routes.draw do
 
         api_resources :systems, :only => [:index, :show, :create, :update, :destroy] do
           member do
-            post :host_collections, :action => :add_host_collections
-            delete :host_collections, :action => :remove_host_collections
-            get :pools
             get :releases
-            put :content_override
-            get :product_content
-            post :subscriptions, :action => :add_subscriptions
           end
           collection do
             get :auto_complete_search

data/config/routes/overrides.rb

@@ -64,6 +64,7 @@ Foreman::Application.routes.draw do
             match '/bulk/destroy' => 'hosts_bulk_actions#destroy_hosts', :via => :put
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
+            match '/subscriptions/' => 'host_subscriptions#create', :via => :post
           end
 
           resources :packages, :only => [:index], :controller => :host_packages do
@@ -82,8 +83,10 @@ Foreman::Application.routes.draw do
               put :auto_attach
               get :product_content
               get :events
+              put :content_override
               put :remove_subscriptions
               put :add_subscriptions
+              delete :destroy
             end
           end
         end

data/db/migrate/20140117160939_refactor_content_views.rb

@@ -14,6 +14,7 @@ class RefactorContentViews < ActiveRecord::Migration
     remove_foreign_key "katello_filters_products", :name => "filters_product_filter_id_fk"
     remove_foreign_key "katello_filters_products", :name => "filters_product_product_id_fk"
     remove_foreign_key "katello_filter_rules", :name => "filters_rules_filter_id_fk"
+    remove_foreign_key "katello_filters_repositories", :name => "filters_repositories_filter_id_fk"
 
     drop_table :katello_content_view_definition_bases
     drop_table :katello_content_view_definition_products

data/db/migrate/20140222022712_remove_provider_discovery.rb

@@ -1,5 +1,6 @@
 class RemoveProviderDiscovery < ActiveRecord::Migration
   def up
+    remove_foreign_key "katello_providers", :name => "providers_discovery_task_id_fk"
     remove_column :katello_providers, :discovery_url
     remove_column :katello_providers, :discovery_task_id
     remove_column :katello_providers, :discovered_repos
@@ -9,5 +10,6 @@ class RemoveProviderDiscovery < ActiveRecord::Migration
     add_column :katello_providers, :discovery_url, :string, :limit => 255
     add_column :katello_providers, :discovered_repos, :text
     add_column :katello_providers, :discovery_task_id, :integer
+    add_foreign_key "katello_providers", "katello_task_statuses", :name => "providers_discovery_task_id_fk", :column => "discovery_task_id"
   end
 end

data/db/migrate/20140502164009_rename_system_groups_to_host_collections.rb

@@ -2,6 +2,9 @@ class RenameSystemGroupsToHostCollections < ActiveRecord::Migration
   def change
     rename_index :katello_key_system_groups, "index_key_system_groups_on_activation_key_id", "index_key_host_collections_on_activation_key_id"
     rename_index :katello_key_system_groups, "index_key_system_groups_on_system_group_id", "index_key_host_collections_on_host_collection_id"
+
+    remove_foreign_key :katello_key_system_groups, :name => "key_system_groups_system_group_id_fk"
+
     rename_column :katello_key_system_groups, :system_group_id, :host_collection_id
     rename_table :katello_key_system_groups, :katello_key_host_collections
 
@@ -10,9 +13,13 @@ class RenameSystemGroupsToHostCollections < ActiveRecord::Migration
     rename_column :katello_system_groups, :max_systems, :max_content_hosts
     rename_table :katello_system_groups, :katello_host_collections
 
+    add_foreign_key :katello_key_host_collections, :katello_host_collections, :name => "key_system_groups_system_group_id_fk", :column => "host_collection_id"
+
     rename_index :katello_system_system_groups, "index_system_system_groups_on_system_group_id", "index_system_host_collections_on_host_collection_id"
     rename_index :katello_system_system_groups, "index_system_system_groups_on_system_id", "index_system_host_collections_on_system_id"
+    remove_foreign_key :katello_system_system_groups, :name => "system_system_groups_system_group_id_fk"
     rename_column :katello_system_system_groups, :system_group_id, :host_collection_id
     rename_table :katello_system_system_groups, :katello_system_host_collections
+    add_foreign_key :katello_system_host_collections, :katello_host_collections, :name => "system_system_groups_system_group_id_fk", :column => "host_collection_id"
   end
 end