GregSutcliffe

Original:

  class { '::certs::pulp_parent': } ~>
  class { 'pulp':
    oauth_key     => $katello::oauth_key,
    oauth_secret  => $katello::oauth_secret,
    messaging_url => 'ssl://localhost:5671',
    before        => Exec['foreman-rake-db:seed']
  }

GregSutcliffe

diff --git a/lib/foreman/default_settings/loader.rb b/lib/foreman/default_settings/loader.rb
index 8a18c49..b1d2a79 100644
--- a/lib/foreman/default_settings/loader.rb
+++ b/lib/foreman/default_settings/loader.rb
@@ -26,6 +26,8 @@ module Foreman
 
         def load(reset=false)
           ppsettings = PuppetSetting.new.get :hostcert, :localcacert, :hostprivkey, :storeconfigs
+            param_enc = Gem::Version.new(Facter.puppetversion.split('-').first) >= Gem::Version.new('2.6.5')
+            puts param_enc.inspect

GregSutcliffe

def thread_count
  return SETTINGS[:threads].to_i if not SETTINGS[:threads].nil? and SETTINGS[:threads].to_i > 0
  require 'facter'
  processors = Facter.value(:processorcount).to_i
  processors > 0 ? processors : 1
end

GregSutcliffe

setenforce 0

# Use acng cacher on another vm
echo "proxy=http://wheezy4:3142" >> /etc/yum.conf

# Mirrorlists break acng, use baseurl
sed -i 's/mirrorlist.*//' /etc/yum.repos.d/CentOS-Base.repo
sed -i 's/#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo

# Epel

GregSutcliffe

#!/bin/bash

# Script to create a new host quickly

cd ~/github/hammer-cli

case $1 in
# Some shortcuts
list)
  bundle exec bin/hammer host list

GregSutcliffe

commit bd691aed587b84fa0acb84fe78ec3b8c91c857f0
Author: Greg Sutcliffe <gsutclif@redhat.com>
Date:   Wed Apr 30 12:59:07 2014 +0100

    Fixes #4287: Correctly skip template associations when looking for matches

diff --git a/app/models/config_template.rb b/app/models/config_template.rb
index ce448dd..f5835db 100644
--- a/app/models/config_template.rb
+++ b/app/models/config_template.rb

GregSutcliffe

diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 0d91b9e..5753982 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -71,8 +71,13 @@ describe 'apache::mod::passenger class', :unless => UNSUPPORTED_PLATFORMS.includ
       end
 
       describe file(conf_file) do
-        it { should contain "PassengerRoot #{passenger_root}" }
-        it { should contain "PassengerRuby #{passenger_ruby}" }

GregSutcliffe

diff --git a/lib/proxy/dhcp/subnet.rb b/lib/proxy/dhcp/subnet.rb
index 75ea301..7153cdb 100644
--- a/lib/proxy/dhcp/subnet.rb
+++ b/lib/proxy/dhcp/subnet.rb
@@ -91,12 +91,12 @@ module Proxy::DHCP
     end
 
     def has_mac? mac
-      records.each {|r| return r if r.mac == mac.downcase }
+      records.each {|r| return r if r.mac == mac.downcase && r.kind == 'reservation' }

GregSutcliffe

commit c37d1b121acee7fe0a96b8af199408184407a795
Author: Greg Sutcliffe <gsutclif@redhat.com>
Date:   Thu May 8 12:15:41 2014 +0100

    Use foreman_url instead of root_url to avoid tunnelling issues

diff --git a/app/views/foreman_setup/provisioners/_step3.html.erb b/app/views/foreman_setup/provisioners/_step3.html.erb
index 19ce6dd..95b8a06 100644
--- a/app/views/foreman_setup/provisioners/_step3.html.erb
+++ b/app/views/foreman_setup/provisioners/_step3.html.erb

GregSutcliffe

diff --git a/lib/net.rb b/lib/net.rb
index 6b0e8ac..2b5a752 100644
--- a/lib/net.rb
+++ b/lib/net.rb
@@ -11,11 +11,7 @@ module Net
         eval("self.#{k}= v") if self.respond_to?("#{k}=")
       end if opts
 
-      raise Net::LeaseConflict.new("#{self.mac}/#{self.ip}") if opts['state']
-