foreman_content 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d2b11da956bb0d25160db53a69e130cd4d6d93
-  data.tar.gz: b7ea75653438011efd63b158822f68f6769f6965
+  metadata.gz: 316501d63ca9034ac6248b472b539ebd12313e41
+  data.tar.gz: 4771b0bdb3ec5e080a321e0e69ed28a5e13ae747
 SHA512:
-  metadata.gz: 651ee332a371f5aab119b72c3d684372e028815fc91ed6fc407e39eda537a525771ec8b84e82b8ffd49ac8d3eb67d256b44d9070f8c80f5b8d1e3c988c8ee4a6
-  data.tar.gz: dce982b68ab1038d275a3ded98acca1763611805999aecff410a8f9312a6f4879802520ab99e44c8c565600791374cfc02583e2f55bb32fa42eab79adee01f3c
+  metadata.gz: ac73329310ab942e6858b833bf4f9e112951b36f78a9bc5065506166dc3bbf79af922364939801e411ccc536775fb0edbe011e7c20cd88be4d622e100bf43d42
+  data.tar.gz: b49837ce5b77ed3443b7d93a56a2ab0fb140eddef907905cce0c7f75529ab89470cf6f86f76cbd293443d8c6fc9955c881a45a10d84b1d36d0a939fd241aa78b

data/README.md

@@ -29,6 +29,7 @@ touch tmp/restart.txt (if using passeger)
 
 ## Pulp
 * enable oauth authentication
+* make sure you have enough disk space! lots of GB to /var/lib/pulp and /var/lib/mongo
 
 ## UI config
 
@@ -50,6 +51,11 @@ You would see in the UI under More, a new sub menu called content, in it:
 * Product    - The actual product you are managing, for example CentOS 6
 * Repository - list of repositories that belong to the above product, for
 example, CentOS 6.4 + CentOS updates.
+* Content View - a collection of cloned repositories
+
+## Create a Product
+
+If you are planning to sync non OS packages (e.g. 3rd party yum repo), you should first create a product, e.g. Foreman 1.2-stable, afterwards, you can add repositories to it.
 
 ## Syncing Repositories
 
@@ -63,8 +69,6 @@ of an Installation media.
 * Architecture - type of files within the repo, usually X86_64 or noarch etc.
 * Operating Systems - list of valid OS's that this repo applies to.
 * Enabled - true / false
-* Unprotected - weather pulp should expose this repo via http and https or just
-  over https.
 * Product - the product from above.
 * GPG key - not implemented
 

data/app/assets/javascripts/content/content.js

@@ -1,12 +1,23 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
+$(function () {
+  // Disable repository selection input based on checkbox
+  $('.repository_selection input:checkbox').click(function () {
+    var checked = $(this).is(':checked');
+    $(this).parent().find($(':input')).each (function ( index, input) {
+      $(input).attr('disabled', !checked);
+    });
+
+  });
+  // toggle repository ID's to send based on the repo type
+  $('.cv-repo-selection').change(function () {
+      enable_selected_repository(this);
+  });
+  $('.cv-repo-selection').change();
+});
+
+function enable_selected_repository(element) {
+  var select = $(element);
+  var id = select.attr('id').replace(/[^\d]/g, '');
+  var clone = select.val() == 'clone';
+  $('#clone-' + id).attr('disabled', !clone);
+  $('#latest-' + id).attr('disabled', clone);
+};

data/app/assets/javascripts/content/repository.js

@@ -0,0 +1,19 @@
+$(function () {
+  // Disable repository sync input based on checkbox
+  $('#content_repository_schedule').click(function () {
+    $('#sync_schedule_form select').attr('disabled', !$(this).is(':checked'));
+  });
+  // try to guess architecture based on the URL
+  $('#content_repository_feed').focusout(function() {
+    url = $(this).val();
+    if (url == undefined || url == '')
+      return;
+
+    $('#content_repository_architecture_id option').each (function ( index, option) {
+      if (url.match(option.text)) {
+        $('#content_repository_architecture_id').val(option.value);
+        return false;
+      }
+    })
+  });
+});

data/app/controllers/content/content_views_controller.rb

@@ -5,16 +5,29 @@ module Content
 
     def index
       @content_views = ContentView.search_for(params[:search], :order => params[:order]).
-          paginate(:page => params[:page])
-      @counter = RepositoryClone.joins(:content_view_repository_clones).group(:content_view_id).count
+        paginate(:page => params[:page])
+      @counter       = ContentViewRepositoryClone.where(:content_view_id => @content_views.map(&:id)).group(:content_view_id).count
 
     end
 
+    def show
+    end
+
     def new
-      @hostgroup = Hostgroup.find_by_id(params[:hostgroup]) if params[:hostgroup]
-      @content_view = ContentViewFactory.create_product_content_view(params[:product]) if params[:product]
-      @content_view ||= ContentViewFactory.create_os_content_view(params[:operatingsystem]) if params[:operatingsystem]
-      @content_view ||= ContentViewFactory.create_composite_content_view(params[:content_content_view_factory]) if params[:content_content_view_factory]
+      options = if params[:product]
+                  {:originator_id => params[:product], :originator_type => 'Content::Product'}
+                elsif params[:operatingsystem]
+                  {:originator_id => params[:operatingsystem], :originator_type => 'Operatingsystem'}
+                elsif params[:hostgroup]
+                  @hostgroup = Hostgroup.find_by_id(params[:hostgroup])
+                  {:originator_id => params[:hostgroup], :originator_type => 'Hostgroup'}
+                elsif params[:content_content_view_factory]
+                  params[:content_content_view_factory]
+                elsif params[:type].blank?
+                  process_error(:error_msg => _('Must provide a type'))
+                end
+      @factory = ContentViewFactory.new(options || {})
+      @content_view = @factory.try(:content_view) if @factory.originator_id
     end
 
     def create

data/app/controllers/content/products_controller.rb

@@ -6,7 +6,7 @@ module Content
     def index
       @products = Product.search_for(params[:search], :order => params[:order]).
           paginate(:page => params[:page])
-      @counter = Repository::Product.group(:product_id).where(:product_id => @products.map(&:id)).count
+      @counter = Repository::Product.group(:originator_id).where(:originator_id => @products.map(&:id)).count
     end
 
     def new

data/app/controllers/content/repositories_controller.rb

@@ -1,11 +1,11 @@
 module Content
   class RepositoriesController < ::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
-    before_filter :find_by_name, :only => %w{show edit update destroy sync}
+    before_filter :find_repo, :only => %w{show edit update destroy sync}
 
     def index
       @repositories = Repository.search_for(params[:search], :order => params[:order]).
-        paginate(:page => params[:page]).includes(:product, :operatingsystem)
+        paginate(:page => params[:page])
     end
 
     def new
@@ -13,7 +13,7 @@ module Content
                     when "operatingsystem"
                       Repository::OperatingSystem.new(:unprotected => true)
                     when "product"
-                      Repository::Product.new(:product_id => params[:product_id])
+                      Repository::Product.new(:originator_id => params[:product_id])
                     else
                       not_found
                     end
@@ -56,5 +56,11 @@ module Content
     rescue => e
       process_error(:error_msg => _("Failed to start sync for %s") % @repository.to_label)
     end
+
+    private
+
+    def find_repo
+      @repository = Content::Repository.find(params[:id])
+    end
   end
 end

data/app/helpers/content/content_views_helper.rb

@@ -1,11 +1,13 @@
 module Content
   module ContentViewsHelper
 
-    def repositories(view)
-      if view.new_record?
-        view.source_repositories + view.repository_clones
+    def repositories
+      cv_repos = @content_view.repository_clones + @content_view.repository_sources
+
+      if @content_view.new_record? && cv_repos.empty? # new form
+        @factory.repositories
       else
-        view.repository_clones
+        cv_repos # edit or new after validation failure
       end
     end
 
@@ -17,5 +19,23 @@ module Content
       end
     end
 
+    def step?
+      if params[:type]
+        'step1'
+      elsif @hostgroup
+        'composite'
+      else
+        'form'
+      end
+    end
+
+    def options_for_type_selection repo
+      options = [[_('Clone (snapshot)'), 'clone']]
+      options << [_('Latest'),'latest'] if repo.kind_of?(Content::Repository) && repo.publish?
+      selected = 'clone' if @factory # default
+      selected ||= @content_view.repository_clone_ids.include?(repo.id) ? 'clone' : 'latest' # on validation error
+      options_for_select(options, selected)
+    end
+
   end
 end

data/app/helpers/content/repositories_helper.rb

@@ -6,5 +6,33 @@ module Content
       time_ago_in_words(time) + ' ago'
     end
 
+    def sync_schedule schedules
+      return _('None') if schedules.empty?
+      schedules.map{|s| s[:schedule]}.join(', ')
+    rescue => e
+      logger.warn _("Failed to fetch sync schedule: ") + e.to_s
+      _('unknown')
+    end
+
+    def time_selector f
+      html_options   = { :class => 'span1', :disabled => f.object.schedule.blank? }
+      f.select(:hour, options_for_time(0..23), {}, html_options) +
+        f.select(:minute, options_for_time(0..59), {}, html_options)
+    end
+
+    def sync_schedule_selector f
+      content_tag :div, :id => 'sync_schedule_form', :class => 'input-prepend input-append' do
+        f.select(:interval, [%w(Daily D), %w(Weekly W)], {}, { :disabled => f.object.schedule.blank? , :class => 'span1' }) +
+          content_tag(:span, :class => 'add-on') { '@' } +
+          time_selector(f)
+      end
+    end
+
+    private
+
+    def options_for_time(options)
+      options.map { |i| [sprintf("%02d", i), i] }
+    end
+
   end
 end

data/app/models/concerns/content/host_extensions.rb

@@ -38,7 +38,7 @@ module Content::HostExtensions
 
     Content::ContentView.joins(:available_content_views).
       where(:content_available_content_views => {:environment_id => environment_id}).
-      where(:originator_type => 'Hostgroup', :originator_id => hostgroup_id).pluck(:id)
+      where(:originator_type => 'Hostgroup', :originator_id => hostgroup_id).pluck('content_content_views.id')
   end
 
   def all_content_view_ids

data/app/models/concerns/content/operatingsystem_extensions.rb

@@ -2,7 +2,7 @@ module Content::OperatingsystemExtensions
   extend ActiveSupport::Concern
 
   included do
-    has_many :repositories, :class_name => 'Content::Repository'
+    has_many :repositories, :class_name => 'Content::Repository', :as => :originator
 
     has_many :available_content_views, :dependent => :destroy, :class_name => 'Content::AvailableContentView'
     has_many :content_views, :as => :originator, :class_name => 'Content::ContentView'

data/app/models/concerns/content/orchestration/pulp.rb

@@ -3,7 +3,7 @@ module Content::Orchestration::Pulp
   include ::Orchestration
 
   included do
-    delegate :sync_status, :sync, :counters, :sync_history, :state, :to => :repo
+    delegate :sync_status, :sync, :sync_schedule, :counters, :sync_history, :state, :to => :repo
   end
 
   def orchestration_errors?

data/app/models/concerns/content/orchestration/pulp/sync.rb

@@ -5,6 +5,9 @@ module Content::Orchestration::Pulp::Sync
   included do
     after_validation :queue_pulp
     before_destroy :queue_pulp_destroy unless Rails.env.test?
+    attr_accessor :interval, :hour, :minute, :schedule
+    validates :interval, :inclusion => { :in => %w(D W) }, :if => :schedule_sync?
+    validates :hour, :minute, :numericality => true, :if => :schedule_sync?
   end
 
   def last_sync
@@ -22,8 +25,14 @@ module Content::Orchestration::Pulp::Sync
     logger.debug "Scheduling new Pulp Repository"
     queue.create(:name   => _("Create Pulp Repository for %s") % self, :priority => 10,
                  :action => [self, :set_pulp_repo])
+    logger.debug "Scheduling new Pulp Repository Sync"
     queue.create(:name   => _("Sync Pulp Repository %s") % self, :priority => 20,
                  :action => [self, :set_sync_pulp_repo])
+    if schedule_sync?
+      logger.debug "Scheduling Pulp Repository sync scheduler"
+      queue.create(:name   => _("Sync Schedule Pulp Repository %s") % self, :priority => 30,
+                   :action => [self, :set_sync_schedule_pulp_repo])
+    end
   end
 
   def queue_pulp_update
@@ -38,7 +47,7 @@ module Content::Orchestration::Pulp::Sync
   end
 
   def set_pulp_repo
-    repo.create
+    publish ? repo.create_with_distributor : repo.create
   end
 
   def del_pulp_repo
@@ -53,6 +62,14 @@ module Content::Orchestration::Pulp::Sync
     repo.cancel_running_sync!
   end
 
+  def set_sync_schedule_pulp_repo
+    repo.sync_schedule = sync_schedule_time
+  end
+
+  def del_sync_schedule_pulp_repo
+    repo.sync_schedule = nil
+  end
+
   def repo_options
     {
       :pulp_id       => pulp_repo_id,
@@ -61,10 +78,28 @@ module Content::Orchestration::Pulp::Sync
       :feed          => feed,
       :content_type  => content_type,
       :protected     => unprotected,
+      :relative_path => relative_path,
+      :auto_publish  => publish
     }
   end
 
   def repo
     @repo ||= Content::Pulp::Repository.new(repo_options)
   end
-end
+
+  def relative_path
+    "#{entity_name}/#{name}"
+  end
+
+  def schedule_sync?
+    schedule.present? && schedule != '0'
+  end
+
+  def sync_schedule_time
+    return if schedule.blank?
+    time       = Time.parse("00:#{hour}:#{minute}").iso8601
+    repetition = "R1" # no limit of hour many syncs
+    "#{repetition}/#{time}/P1#{interval}"
+  end
+
+end

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

@@ -6,7 +6,7 @@ module Content::RedhatExtensions
   end
 
   def medium_uri_with_content_uri host, url = nil
-    if url.nil? && (full_path = Content::Repository.available_for_host(host).kickstart.first.try(:full_path))
+    if url.nil? && (full_path = kickstart_repo(host).try(:full_path))
       URI.parse(full_path)
     else
       medium_uri_without_content_uri(host, url)
@@ -16,7 +16,14 @@ module Content::RedhatExtensions
   # return an array of repositories for kickstart script as additional repos
   # to the kickstart main repo, this list will typically include updates and epel
   def repos host
-    host.attached_repositories.yum.map { |repo| format_repo(repo) }
+    yum_repos(host).map { |repo| format_repo(repo) }
+  end
+
+  def boot_files_uri(medium, architecture)
+    Redhat::PXEFILES.values.collect do |img|
+      medium_vars_to_uri("#{medium.path}/#{pxedir}/#{img}", architecture.name, self)
+    URI.parse(interpolate_medium_vars(url, arch, os)).normalize
+    end
   end
 
   private
@@ -25,9 +32,18 @@ module Content::RedhatExtensions
     {
       :baseurl     => repo.full_path,
       :name        => repo.to_label,
-      :description => repo.product.description,
+      :description => repo.description,
       :enabled     => repo.enabled,
       :gpgcheck    => !!repo.gpg_key
     }
   end
+
+  def kickstart_repo host
+    host.attached_repositories.detect{|r| r.content_type == Content::Repository::KICKSTART_TYPE}
+  end
+
+  def yum_repos host
+    host.attached_repositories.select{|r| r.content_type == Content::Repository::YUM_TYPE}
+  end
+
 end

data/app/models/concerns/content/repository_common.rb

@@ -0,0 +1,13 @@
+module Content::RepositoryCommon
+
+  extend ActiveSupport::Concern
+
+  REPO_PREFIX = '/pulp/repos/'
+
+  def full_path
+    pulp_url = URI.parse(Setting.pulp_url)
+    scheme   = (unprotected ? 'http' : 'https')
+    port     = (pulp_url.port == 443 || pulp_url.port == 80 ? "" : ":#{pulp_url.port}")
+    "#{scheme}://#{pulp_url.host}#{port}#{REPO_PREFIX}#{relative_path}"
+  end
+end

data/app/models/content/content_view.rb

@@ -1,6 +1,7 @@
 module Content
   class ContentView < ActiveRecord::Base
     has_ancestry :orphan_strategy => :rootify
+    attr_accessor :repository_ids_to_clone
 
     belongs_to :originator, :polymorphic => true
     has_many :available_content_views, :dependent => :destroy
@@ -10,18 +11,23 @@ module Content
     has_many :content_view_hosts, :dependent => :destroy, :uniq => true, :foreign_key => :content_view_id, :class_name => 'Content::ContentViewHost'
     has_many :hosts, :through => :content_view_hosts
 
+    before_destroy :clean_unused_clone_repos
     has_many :content_view_repository_clones, :dependent => :destroy
-    has_many :repository_clones, :through => :content_view_repository_clones, :class_name => 'Content::RepositoryClone'
-    has_many :repositories, :through => :repository_clones
+
+    has_many :repository_clones, :through => :content_view_repository_clones,
+             :source => :repository, :source_type => 'Content::RepositoryClone'
+
+    has_many :repository_sources, :through => :content_view_repository_clones,
+             :source => :repository, :source_type => 'Content::Repository'
 
     scope :hostgroups, where(:originator_type => 'Hostgroup')
     scope :products, where(:originator_type => 'Content::Product')
     scope :operatingsystem, where(:originator_type => 'Operatingsystem')
 
-    after_save :clone_repos
-    before_destroy :clean_unused_clone_repos
+    after_create :clone_repos
 
     validates_presence_of :name
+    validates_uniqueness_of :name, :scope => [:originator_id, :originator_type]
 
     # special relationships needed for search with polymorphic associations
     belongs_to :search_hostgroups, :class_name => 'Hostgroup', :foreign_key => :originator_id,
@@ -38,28 +44,28 @@ module Content
     scoped_search :in => :search_hostgroups, :on => :label, :complete_value => true,
                   :rename => :hostgroup, :only_explicit => true
 
-    attr_accessor :source_repositories
-
     def to_label
       name || "#{originator.to_label} - #{DateTime.now.strftime("%m/%d/%Y")}".parameterize
     end
 
+    private
+
     def clone_repos
-      return unless @source_repositories
-      Repository.where(:id => @source_repositories).each do |repository|
-        repository.publish self
+      return unless repository_ids_to_clone
+      Repository.where(:id => repository_ids_to_clone).each do |repository|
+        repository.clone self
       end
     end
 
-    private
-
     def clean_unused_clone_repos
-      current_repos = Content::ContentViewRepositoryClone.where(:content_view_id => id).pluck(:repository_clone_id)
-      used_repos   = Content::ContentViewRepositoryClone.
-        where(:repository_clone_id => current_repos).
-        where(['content_view_id IS NOT ?', id]).pluck(:repository_clone_id)
+      current_repos = Content::ContentViewRepositoryClone.where(:content_view_id => id, :repository_type => 'Content::RepositoryClone').pluck(:repository_id)
+      used_repos    = Content::ContentViewRepositoryClone.
+        where(:repository_id => current_repos).
+        where(['content_view_id IS NOT ?', id]).pluck(:repository_id)
 
       repos_to_delete = current_repos - used_repos
+      logger.debug('All Cloned repositories are used elsewhere, nothing to do') if repos_to_delete.empty?
+      logger.debug("Clone Repos IDS: #{repos_to_delete.join(', ')} are unused - deleting...") if repos_to_delete.any?
       Content::RepositoryClone.destroy(repos_to_delete) if repos_to_delete.any?
     end
   end