foreman-katello-engine 0.0.10 → 0.0.14

data/app/models/setting/katello.rb

@@ -6,7 +6,7 @@ class Setting::Katello < ::Setting
     Setting.transaction do
       [
        self.set('katello_url', 'url of a Katello instance', 'https://localhost/katello'),
-      ].compact.each { |s| self.create s.update(:category => "Setting::Katello")}
+      ].compact.each { |s| self.create! s.update(:category => "Setting::Katello")}
     end
     true
   end

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

@@ -1,3 +1,12 @@
+#kind: provision
+#name: Community Kickstart
+#oses:
+#- CentOS 5
+#- CentOS 6
+#- Fedora 16
+#- Fedora 17
+#- Fedora 18
+#- Fedora 19
 install
 <%= @mediapath %>
 lang en_US.UTF-8
@@ -7,11 +16,16 @@ skipx
 network --bootproto <%= @static ? "static" : "dhcp" %> --hostname <%= @host %>
 rootpw --iscrypted <%= root_pass %>
 firewall --<%= @host.operatingsystem.major.to_i >= 6 ? "service=" : "" %>ssh
-authconfig --useshadow --enablemd5
+authconfig --useshadow --passalgo=sha256 --kickstart
 timezone UTC
+services --disabled 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
+
 <% if @host.operatingsystem.name == "Fedora" -%>
 repo --name=fedora-everything --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-<%= @host.operatingsystem.major %>&arch=<%= @host.architecture %>
+<% elsif @host.operatingsystem.family == "Redhat" %>
+repo --name="Extra Packages for Enterprise Linux" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-<%= @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 %>
@@ -19,24 +33,24 @@ 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
+%packages --ignoremissing
 yum
 dhclient
 ntp
 wget
 @Core
+epel-release
+puppet
 <%= "%end\n" if @host.operatingsystem.name == "Fedora" %>
 
 <% if @dynamic -%>
@@ -62,19 +76,13 @@ exec < /dev/tty3 > /dev/tty3
 (
 #update local time
 echo "updating system time"
-/usr/sbin/ntpdate -sub <%= @host.params["ntp-server"] || "ntp" %>
+/usr/sbin/ntpdate -sub <%= @host.params["ntp-server"] || "0.fedora.pool.ntp.org" %>
 /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
+<%= snippets "subscription_manager_registration" %>
 
 echo "Configuring puppet"
 cat > /etc/puppet/puppet.conf << EOF
@@ -84,15 +92,9 @@ 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
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag --server <%= @host.puppetmaster %>  --no-daemonize
 
-  sync
+sync
 
 # Inform the build system that we are done.
 echo "Informing Foreman that we are built"

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

@@ -0,0 +1,92 @@
+#kind: provision
+#name: Community Kickstart RHEL
+#oses:
+#- RedHat 5
+#- RedHat 6
+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 --passalgo=sha256 --kickstart
+timezone UTC
+services --disabled 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
+
+repo --name="Extra Packages for Enterprise Linux" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-<%= @host.operatingsystem.major %>&arch=<%= @host.architecture %>
+
+bootloader --location=mbr --append="nofb quiet splash=quiet" <%= grub_pass %>
+key --skip
+
+<% if @dynamic -%>
+%include /tmp/diskpart.cfg
+<% else -%>
+<%= @host.diskLayout %>
+<% end -%>
+
+text
+reboot
+
+%packages --ignoremissing
+yum
+dhclient
+ntp
+wget
+@Core
+epel-release
+puppet
+
+<% 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
+
+%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"] || "0.fedora.pool.ntp.org" %>
+/usr/sbin/hwclock --systohc
+
+# update all the base packages from the updates repository
+yum -t -y -e 0 update
+
+<%= snippets "subscription_manager_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
+
+/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

data/app/views/unattended/snippets/{_katello_registration.erb → _subscription_manager_registration.erb}

@@ -1,8 +1,11 @@
 <% 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 %>
+rpm -ivh <%= 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 %>
+<% if @host.puppetmaster %>
+  subscription-manager config --rhsm.baseurl=https://<%= @host.puppetmaster %>/pulp/repos
+<% end %>

data/db/migrate/20130416152224_add_katello_templates.rb

@@ -2,12 +2,17 @@ class AddKatelloTemplates < ActiveRecord::Migration
   def self.up
     ConfigTemplate.where(:name => "Katello Kickstart Default").first_or_create!( 
         :template_kind_id    => TemplateKind.find_by_name('provision').id,
-        :operatingsystem_ids => Redhat.all.map(&:id),
+        :operatingsystem_ids => Operatingsystem.where("name not like ? and type = ?", "Red Hat Enterprise Linux", "Redhat").map(&:id),
         :template            => File.read("#{ForemanKatelloEngine::Engine.root}/app/views/unattended/kickstart-katello.erb"))
+
+    ConfigTemplate.where(:name => "Katello Kickstart Default for RHEL").first_or_create!( 
+        :template_kind_id    => TemplateKind.find_by_name('provision').id,
+        :operatingsystem_ids => Redhat.where("name like ?", "Red Hat Enterprise Linux").map(&:id),
+        :template            => File.read("#{ForemanKatelloEngine::Engine.root}/app/views/unattended/kickstart-katello_rhel.erb"))
     
-    ConfigTemplate.where(:name => "Subscription Manager Registration").first_or_create!(
+    ConfigTemplate.where(:name => "subscription_manager_registration").first_or_create!(
       :snippet  => true,
-      :template => File.read("#{ForemanKatelloEngine::Engine.root}/app/views/unattended/snippets/_katello_registration.erb"))
+      :template => File.read("#{ForemanKatelloEngine::Engine.root}/app/views/unattended/snippets/_subscription_manager_registration.erb"))
   rescue Exception => e
     # something bad happened, but we don't want to break the migration process
     Rails.logger.warn "Failed to migrate #{e}"

data/foreman-katello-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.10"
+  s.version = "0.0.14"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"

data/lib/foreman_katello_engine/bindings.rb

@@ -9,6 +9,7 @@ module ForemanKatelloEngine
         {
           :base_url => Setting['katello_url'],
           :enable_validations => false,
+          :system => 'system_foreman',
           :oauth => {
             :consumer_key => Setting['oauth_consumer_key'],
             :consumer_secret => Setting['oauth_consumer_secret']
@@ -17,15 +18,15 @@ module ForemanKatelloEngine
       end
 
       def environment
-        KatelloApi::Resources::Environment.new(client_config)
+        resource(KatelloApi::Resources::Environment)
       end
 
       def content_view
-        KatelloApi::Resources::ContentView.new(client_config)
+        resource(KatelloApi::Resources::ContentView)
       end
 
       def activation_key
-        KatelloApi::Resources::ActivationKey.new(client_config)
+        resource(KatelloApi::Resources::ActivationKey)
       end
 
       def activation_keys_to_subscriptions(org_label, env_label, content_view_label = nil)
@@ -51,6 +52,17 @@ module ForemanKatelloEngine
         end
       end
 
+      private
+
+      # configure resource client to be used to call Katello.
+      # We need to do this for every resoruce right now.
+      # We might improve this on foreman_api side later.
+      def resource(resource_class)
+        resource = resource_class.new(client_config)
+        resource.client.options[:headers]['HTTP_KATELLO_USER'] = User.current.login
+        return resource
+      end
+
     end
   end
 

data/test/lib/bindings_test.rb

@@ -4,6 +4,7 @@ require 'mocha/setup'
 class BindingsTest < ActiveSupport::TestCase
 
   def setup
+    User.current = User.find_by_login('one')
     Setting::Auth.load_defaults
     Setting::Katello.load_defaults
   end
@@ -12,10 +13,12 @@ class BindingsTest < ActiveSupport::TestCase
     Setting::Katello['katello_url'] = 'https://example.com/katello'
     Setting::Auth['oauth_consumer_key'] = 'key'
     Setting::Auth['oauth_consumer_secret'] = 'secret'
-    config = ForemanKatelloEngine::Bindings.environment.config
+    resource = ForemanKatelloEngine::Bindings.environment
+    config = resource.config
     assert_equal 'https://example.com/katello', config[:base_url]
     assert_equal 'key', config[:oauth][:consumer_key]
     assert_equal 'secret', config[:oauth][:consumer_secret]
+    assert_equal 'one', resource.client.options[:headers]['HTTP_KATELLO_USER']
   end
 
   test 'activation keys to subscriptions mapping' do

data/test/lib/settings_test.rb

@@ -2,6 +2,10 @@ require 'test_helper'
 
 class SettingsTest < ActiveSupport::TestCase
 
+  def setup
+    Setting::Katello.all.each(&:destroy)
+  end
+
   test "katello specific settings" do
     Setting::Katello.load_defaults
     assert_equal 'https://localhost/katello', Setting::Katello['katello_url']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-katello-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -63,7 +63,8 @@ files:
 - app/views/foreman_katello_engine/activation_keys/_host_environment_select.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/views/unattended/snippets/_subscription_manager_registration.erb
+- app/views/unattended/kickstart-katello_rhel.erb
 - app/assets/images/foreman_katello_engine/link.png
 - app/overrides/add_activation_keys_input.rb
 - app/overrides/add_katello_link.rb