foreman-katello-engine 0.0.7 → 0.0.8

data/README.md

@@ -67,4 +67,17 @@ To execute a single test file run:
 Licence
 -------
 
-GPLv2
+Copyright (c) 2013 Red Hat Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/db/migrate/20130419110332_update_environments_add_katello_id.rb

@@ -5,6 +5,6 @@ class UpdateEnvironmentsAddKatelloId < ActiveRecord::Migration
   end
 
   def down
-    remote_column :environment, :katello_id
+    remove_column :environment, :katello_id
   end
 end

data/foreman-katello-engine.gemspec

@@ -1,14 +1,21 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"
   s.description = "Katello specific parts of Foreman"
   s.email = "katello-devel@redhat.com"
-  s.files = `git ls-files`.split("\n")
+  s.files = %w(foreman-katello-engine.gemspec Gemfile LICENSE Rakefile README.md)
+  s.files += Dir["app/**/*.rb"]
+  s.files += Dir["config/**/*.rb"]
+  s.files += Dir["db/**/*.rb"]
+  s.files += Dir["lib/**/*.rb"]
+  s.files += Dir["test/test_helper.rb"]
+  s.files += Dir["test/lib/**/*.rb"]
+  s.files += Dir["test/functional/**/*.rb"]
   s.homepage = "http://github.com/katello/foreman-katello-engine"
-  s.licenses = ["GPL-2"]
+  s.licenses = ["GPL-3"]
   s.require_paths = ["lib"]
   s.add_dependency "katello_api"
   s.add_dependency "deface", "~> 0.7.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-katello-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -49,46 +49,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- foreman-katello-engine.gemspec
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
-- app/assets/images/foreman_katello_engine/link.png
-- app/controllers/foreman_katello_engine/activation_keys_controller.rb
-- app/controllers/foreman_katello_engine/api/environments_controller.rb
-- app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb
-- app/helpers/foreman_katello_engine/katello_urls_helper.rb
+- README.md
 - app/models/foreman_katello_engine/environment.rb
 - app/models/setting/katello.rb
+- app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb
+- app/helpers/foreman_katello_engine/katello_urls_helper.rb
 - app/overrides/add_activation_keys_input.rb
 - app/overrides/add_katello_link.rb
-- app/views/foreman_katello_engine/activation_keys/_host_environment_select.html.erb
-- app/views/foreman_katello_engine/activation_keys/_host_tab.html.erb
-- app/views/foreman_katello_engine/activation_keys/_host_tab_pane.html.erb
-- app/views/foreman_katello_engine/layout/_katello_link.html.erb
-- app/views/unattended/kickstart-katello.erb
-- app/views/unattended/snippets/_katello_registration.erb
+- app/controllers/foreman_katello_engine/api/environments_controller.rb
+- app/controllers/foreman_katello_engine/activation_keys_controller.rb
 - config/routes.rb
-- db/migrate/20130416152224_add_katello_templates.rb
 - db/migrate/20130418105901_add_katello_ptables.rb
+- db/migrate/20130416152224_add_katello_templates.rb
 - db/migrate/20130419110332_update_environments_add_katello_id.rb
-- foreman-katello-engine.gemspec
 - lib/foreman-katello-engine.rb
-- lib/foreman_katello_engine.rb
-- lib/foreman_katello_engine/bindings.rb
 - lib/foreman_katello_engine/engine.rb
 - lib/foreman_katello_engine/renderer.rb
-- script/rails
+- lib/foreman_katello_engine/bindings.rb
+- lib/foreman_katello_engine.rb
+- test/test_helper.rb
+- test/lib/settings_test.rb
+- test/lib/bindings_test.rb
 - test/functional/activation_keys_controller_test.rb
 - test/functional/api/environments_controller_test.rb
-- test/lib/bindings_test.rb
-- test/lib/settings_test.rb
-- test/test_helper.rb
 homepage: http://github.com/katello/foreman-katello-engine
 licenses:
-- GPL-2
+- GPL-3
 post_install_message: 
 rdoc_options: []
 require_paths:

data/.gitignore

@@ -1,3 +0,0 @@
-Gemfile.lock
-test/foreman_app
-.bundle

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-  - "1.9.3"
-before_install: rake test:foreman_prepare
-script: rake test

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

@@ -1,13 +0,0 @@
-<style>
-  option.kt-env { margin-left: 0em; }
-  option.kt-cv  { margin-left: 1em; }
-</style>
-
-<%= field(f, :environment_id, {:include_blank => true}) do
-    f.select :environment_id,
-             grouped_env_options,
-             {:include_blank =>true},
-             {:onchange => 'update_puppetclasses(this);',
-              :"data-url" => environment_selected_hostgroups_path,
-              :'data-host-id' => (@host && @host.id)}
-end %>

data/app/views/foreman_katello_engine/activation_keys/_host_tab.html.erb

@@ -1,3 +0,0 @@
-<li id="activation_keys_tab">
-  <a href="#activation_keys" data-toggle="tab">Activation Keys</a>
-</li>

data/app/views/foreman_katello_engine/activation_keys/_host_tab_pane.html.erb

@@ -1,250 +0,0 @@
-<%= javascript_tag do %>
-
-$(function() {
-    var KT_AK_LABEL = "<%= kt_ak_label %>";
-    var availableActivationKeys = {};
-
-    function ktLoadActivationKeys() {
-        if(ktSelectedOrgEnvCv()[0]) {
-            ktAkTab().show();
-        } else {
-            ktAkTab().hide();
-            return; //no Katello-specific env selected
-        }
-
-        $("#ak-subscriptions-info").hide();
-        $("#ak-subscriptions-spinner").show();
-        var url = foreman_url('/foreman_katello_engine/activation_keys');
-        var environmentId = $("#hostgroup_environment_id").val();
-        if(environmentId) {
-            $.ajax({
-                type: 'get',
-                url:  url,
-                data:'environment_id=' + environmentId,
-                success: function(response) {
-                    availableActivationKeys = response;
-                },
-                error: function(error) {
-                    $.jnotify("Error while loading activation keys from Katello", { type: "error", sticky: true });
-                },
-                complete: function() {
-                    ktAkUpdateSubscriptionsInfo();
-                }
-            });
-        } else {
-            availableActivationKeys = {};
-            ktAkUpdateSubscriptionsInfo();
-        }
-    }
-
-    function ktFindParamContainer(name){
-        var ret;
-        $("div#parameters div.control-group input[ type = 'text']").each(function () {
-            element = $(this);
-            if(element.val() == name) {
-                ret = element.parent();
-                return false;
-            }
-        });
-        return ret;
-    }
-
-    function ktOrganizations() {
-        return $.grep($("#organizations #hostgroup_organization_ids option"), function (el) {
-            return $(el).text().trim().match(/^KT-/)
-        });
-    }
-
-    function ktParseOrgName(frOrgName) {
-        return frOrgName.match(/^kt-\[(.*)\]\[(.*)\]$/);
-    }
-
-    function ktHideParams() {
-        var paramsToHide = [ktFindParamContainer(KT_AK_LABEL),
-                            ktFindParamContainer('kt_org'),
-                            ktFindParamContainer('kt_env')];
-        $.each(paramsToHide, function (i, paramContainer) {
-            if(paramContainer) {
-                paramContainer.hide();
-            }
-        });
-    }
-
-    function ktSelectedOrgEnvCv() {
-        var selectedEnvId = $("#hostgroup_environment_id").val();
-        var selectedOption = $("#hostgroup_environment_id option[ value ='" + selectedEnvId + "' ]");
-
-        var ktEnvOption, ktCvOption, ktOrgLabel, ktEnvLabel, ktCvLabel;
-        if(selectedOption.hasClass('kt-cv')) {
-            ktCvOption = selectedOption;
-            ktEnvOption = ktCvOption.prevAll('option.kt-env').first();
-        } else if(selectedOption.hasClass('kt-env')) {
-            ktEnvOption = selectedOption;
-        }
-
-        if(ktEnvOption) {
-            ktEnvLabel = ktEnvOption.text();
-            ktOrgLabel = ktEnvOption.parent().attr('label');
-        }
-
-        if(ktCvOption) {
-            ktCvLabel = ktCvOption.text();
-        }
-        return [ktOrgLabel, ktEnvLabel, ktCvLabel];
-    }
-
-    function ktSetParam(name, value) {
-        var paramContainer = ktFindParamContainer(name);
-        if(value) {
-            if(! paramContainer) { // we create the param for kt_activation_keys
-                $("div#parameters a.btn-success").click();
-                paramContainer = $("div#parameters div.control-group").last();
-                paramContainer.find("input").val(name);
-            }
-            paramContainer.find("textarea").val(value);
-        } else if(paramContainer) {
-            // we remove the param by setting destoy to 1
-            paramContainer.find("input[ type = 'hidden' ]").val(1);
-        }
-
-    }
-
-    function ktEnvToParam() {
-        var orgEnvCv = ktSelectedOrgEnvCv() || [];
-        ktSetParam('kt_org', orgEnvCv[0]);
-        ktSetParam('kt_env', orgEnvCv[1]);
-        ktSetParam('kt_cv',  orgEnvCv[2]);
-    }
-
-    function ktEnvToFrOrganizations() {
-        var orgEnvCv = ktSelectedOrgEnvCv() || [];
-
-        var orgName = "";
-        if(orgEnvCv[0]) {
-            orgName = 'KT-[' + orgEnvCv[0] + ']';
-        }
-
-        $.each(ktOrganizations(), function (i, option) {
-            if(orgName == $(option).text().trim()) {
-                $("#hostgroup_organization_ids").multiSelect('select', $(option).val());
-            } else {
-                $("#hostgroup_organization_ids").multiSelect('deselect', $(option).val());
-            }
-        });
-    }
-
-    function ktParamToAkInput() {
-        var paramContainer = ktFindParamContainer(KT_AK_LABEL);
-        if(paramContainer) {
-            $("#kt_activation_keys").val(paramContainer.find("textarea").val());
-        }
-    }
-
-    function ktAkInputToParam() {
-        var ktActivationKeysValue = $("#kt_activation_keys").val().replace(/,\s*/g,",").replace(/,$/g,"");
-        ktSetParam(KT_AK_LABEL, ktActivationKeysValue);
-    }
-
-    function ktAkUpdateSubscriptionsInfo() {
-        var subsInfo = $("ul#ak-subscriptions-info");
-        subsInfo.empty();
-        var selectedKeys = $("#kt_activation_keys").val().split(/,\s*/);
-        $.each(selectedKeys, function(i, key) {
-          if(availableActivationKeys[key]) {
-            // hack to make it working with deface
-            var ul = "<ul>", ul_end = "</ul>", li = "<li>", li_end = "</li>";
-            content = li + key + ul;
-            if(!availableActivationKeys[key].length == 0) {
-                content += li;
-                content += availableActivationKeys[key].join(li_end + li);
-                content += li_end;
-            }
-            content +=  ul_end + li_end;
-            subsInfo.append(content);
-          }
-        });
-        $("#ak-subscriptions-info").show();
-        $("#ak-subscriptions-spinner").hide();
-    }
-
-    function ktAkTab() {
-        return $('li#activation_keys_tab');
-    }
-
-    function ktOnLoad() {
-        ktHideParams();
-        ktParamToAkInput();
-        ktLoadActivationKeys();
-    };
-
-    function ktOnSubmit() {
-        ktAkInputToParam();
-        ktEnvToParam();
-        ktEnvToFrOrganizations();
-    }
-
-
-    $("#kt_activation_keys").parents("form").submit(ktOnSubmit);
-
-    ktOnLoad();
-
-    $("#kt_activation_keys").autocomplete({
-        minLength: 0,
-        source: function(request, response) {
-            var terms = request.term.split(/,\s*/);
-            var part = terms.pop();
-            var items = []
-            for(key in availableActivationKeys) {
-                if(terms.indexOf(key) == -1) {
-                    items.push(key);
-                }
-            }
-            response($.ui.autocomplete.filter(
-                items, part));
-        },
-        focus: function() {
-            // prevent value inserted on focus
-            return false;
-        },
-        select: function(event, ui) {
-            var oldTerms = this.value.replace(/[^, ][^,]*$/,"");
-            this.value = oldTerms + ui.item.value;
-            ktAkUpdateSubscriptionsInfo();
-            return false;
-        },
-        close: function() {
-            ktAkUpdateSubscriptionsInfo();
-        }
-
-    }).bind("focus", function(event) {
-        if($(this)[0].value == "") {
-	    $(this).autocomplete( "search" );
-        }});
-
-    $("#hostgroup_environment_id").change(ktLoadActivationKeys);
-
-    $("#ak_refresh_subscriptions").click(function () {
-        ktLoadActivationKeys();
-        return false;
-    });
-
-});
-
-<% end %>
-<div class="tab-pane" id="activation_keys">
-  <%= field(f, "Activation Keys", :help_inline => "comma separated values. The value will be available in templates as @host.params['#{kt_ak_label}']") do
-    text_field_tag("kt_activation_keys", "", :style => 'width: 98%')
-  end %>
-  <div class="alert alert-info">
-    <p><b>Subscriptions information based on selected activation keys:</b></p>
-    <ul id="ak-subscriptions-info">
-    </ul>
-    <div id="ak-subscriptions-spinner" style="display: none">
-      <%= image_tag "spinner.gif" %>
-    </div>
-    <p>Activation keys and subscriptions can be managed
-      <b><a href="<%= Setting['katello_url'] %>/activation_keys" target="_blank">here</a></b>
-    </p>
-    <p><a href="" id="ak_refresh_subscriptions">Reload data from Katello</a></p>
-  </div>
-</div>

data/app/views/foreman_katello_engine/layout/_katello_link.html.erb

@@ -1,3 +0,0 @@
-<li>
-  <%= link_to "#{ForemanKatelloEngine::LABEL} #{image_tag("foreman_katello_engine/link.png")}".html_safe, Setting['katello_url'] %>
-</li>

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

@@ -1,104 +0,0 @@
-install
-<%= @mediapath %>
-lang en_US.UTF-8
-selinux --permissive
-keyboard us
-skipx
-network --bootproto <%= @static ? "static" : "dhcp" %> --hostname <%= @host %>
-rootpw --iscrypted <%= root_pass %>
-firewall --<%= @host.operatingsystem.major.to_i >= 6 ? "service=" : "" %>ssh
-authconfig --useshadow --enablemd5
-timezone UTC
-<% if @host.operatingsystem.name == "Fedora" -%>
-repo --name=fedora-everything --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-<%= @host.operatingsystem.major %>&arch=<%= @host.architecture %>
-<% end -%>
-<% if @host.operatingsystem.name == "Fedora" and @host.operatingsystem.major.to_i <= 16 -%>
-# Bootloader exception for Fedora 16:
-bootloader --append="nofb quiet splash=quiet <%=ks_console%>" <%= grub_pass %>
-part biosboot --fstype=biosboot --size=1
-<% else -%>
-bootloader --location=mbr --append="nofb quiet splash=quiet" <%= grub_pass %>
-<% end -%>
-<% if @host.os.name == "RedHat" -%>
-key --skip
-<% end -%>
-
-<% if @dynamic -%>
-%include /tmp/diskpart.cfg
-<% else -%>
-<%= @host.diskLayout %>
-<% end -%>
-text
-reboot
-
-%packages
-yum
-dhclient
-ntp
-wget
-@Core
-<%= "%end\n" if @host.operatingsystem.name == "Fedora" %>
-
-<% if @dynamic -%>
-%pre
-<%= @host.diskLayout %>
-<% end -%>
-
-%post --nochroot
-exec < /dev/tty3 > /dev/tty3
-#changing to VT 3 so that we can see whats going on....
-/usr/bin/chvt 3
-(
-cp -va /etc/resolv.conf /mnt/sysimage/etc/resolv.conf
-/usr/bin/chvt 1
-) 2>&1 | tee /mnt/sysimage/root/install.postnochroot.log
-<%= "%end\n" if @host.operatingsystem.name == "Fedora" %>
-
-%post
-logger "Starting anaconda <%= @host %> postinstall"
-exec < /dev/tty3 > /dev/tty3
-#changing to VT 3 so that we can see whats going on....
-/usr/bin/chvt 3
-(
-#update local time
-echo "updating system time"
-/usr/sbin/ntpdate -sub <%= @host.params["ntp-server"] || "ntp" %>
-/usr/sbin/hwclock --systohc
-
-# install epel if we can
-<%= snippet 'epel' %>
-
-# update all the base packages from the updates repository
-yum -t -y -e 0 update
-
-<%= snippets "katello_registration" %>
-
-# and add the puppet package
-yum -t -y -e 0 install puppet
-
-echo "Configuring puppet"
-cat > /etc/puppet/puppet.conf << EOF
-<%= snippets "puppet.conf" %>
-EOF
-
-# Setup puppet to run on system reboot
-/sbin/chkconfig --level 345 puppet on
-
-# Disable most things. Puppet will activate these if required.
-echo "Disabling various system services"
-<% %w{autofs gpm sendmail cups iptables ip6tables auditd arptables_jf xfs pcmcia isdn rawdevices hpoj bluetooth openibd avahi-daemon avahi-dnsconfd hidd hplip pcscd restorecond mcstrans rhnsd yum-updatesd}.each do |service| -%>
-  /sbin/chkconfig --level 345 <%= service %> off 2>/dev/null
-  <% end -%>
-
-  /usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag --server <%= @host.puppetmaster %>  --no-daemonize
-
-  sync
-
-# Inform the build system that we are done.
-echo "Informing Foreman that we are built"
-wget -q -O /dev/null --no-check-certificate <%= foreman_url %>
-# Sleeping an hour for debug
-) 2>&1 | tee /root/install.post.log
-exit 0
-
-<%= "%end\n" if @host.operatingsystem.name == "Fedora" -%>

data/app/views/unattended/snippets/_katello_registration.erb

@@ -1,8 +0,0 @@
-<% if @host.params['kt_org'] and @host.params['kt_activation_keys'] %>
-# add subscription manager
-yum -t -y -e 0 install subscription-manager
-yum -y install <%= subscription_manager_configuration_url %>
-
-echo "Registering the System"
-subscription-manager register --org=<%= @host.params['kt_org']%> --name=<%= @host.name %> --activationkey=<%= @host.params['kt_activation_keys'] %>
-<% end %>

data/script/rails

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/foreman_katello_engine/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'