ironfan 4.5.0 → 4.5.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.5.1:
+* Clean up on 12.04 template - do dist-upgrade, include omnibus bin in $PATH, nicer first-boot.json
+* Removing superfluous raise on duplicate machines during load
+
 # v4.5.0: upgraded to 12.04 bootstrap
 * First stab at 12.04 from @nickmarden's pull #171 - uses omnibus, not autobuild ruby
 * Removed bad 11.10 bootstrap script - used incompatible ruby install

data/VERSION

@@ -1 +1 @@
-4.5.0
+4.5.1

data/config/ubuntu12.04-ironfan.erb

@@ -18,7 +18,7 @@ date > /etc/box_build_time
 
 echo -e "`date` \n\n**** \n**** apt update:\n****\n"
 apt-get --force-yes -y update
-apt-get --force-yes -y upgrade
+apt-get --force-yes -y dist-upgrade
 
 echo -e "`date` \n\n**** \n**** Installing base packages:\n****\n"
 apt-get --force-yes -y install build-essential make wget curl runit zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libxml2-dev libxslt-dev libyaml-dev libreadline6 libreadline6-dev
@@ -44,9 +44,15 @@ if [ ! -f /opt/chef/bin/chef-client ]; then
   curl -L http://www.opscode.com/chef/install.sh | sudo bash
 fi
 
-# Set up the system to use the installed ruby and gem
-ln -nfs /opt/chef/embedded/bin/ruby /usr/bin/ruby
-ln -nfs /opt/chef/embedded/bin/gem /usr/bin/gem
+# Include the omnibus' path in the system-wide path, to allow use of
+#   its executables (gem, ruby, bundler, etc.)
+(
+cat <<'EOP'
+PATH="/opt/chef/embedded/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
+EOP
+) >> /etc/environment
+. /etc/environment
+
 
 gem install extlib bundler json right_aws pry fog
 
@@ -88,7 +94,7 @@ EOP
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
+<%= { "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index, "environment" => @config[:server].environment }.to_json%>
 EOP
 ) > /etc/chef/first-boot.json
 

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.5.0"
+  s.version = "4.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-11-07"
+  s.date = "2012-11-14"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/chef/knife/bootstrap/ubuntu12.04-ironfan.erb

@@ -18,7 +18,7 @@ date > /etc/box_build_time
 
 echo -e "`date` \n\n**** \n**** apt update:\n****\n"
 apt-get --force-yes -y update
-apt-get --force-yes -y upgrade
+apt-get --force-yes -y dist-upgrade
 
 echo -e "`date` \n\n**** \n**** Installing base packages:\n****\n"
 apt-get --force-yes -y install build-essential make wget curl runit zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libxml2-dev libxslt-dev libyaml-dev libreadline6 libreadline6-dev
@@ -44,9 +44,15 @@ if [ ! -f /opt/chef/bin/chef-client ]; then
   curl -L http://www.opscode.com/chef/install.sh | sudo bash
 fi
 
-# Set up the system to use the installed ruby and gem
-ln -nfs /opt/chef/embedded/bin/ruby /usr/bin/ruby
-ln -nfs /opt/chef/embedded/bin/gem /usr/bin/gem
+# Include the omnibus' path in the system-wide path, to allow use of
+#   its executables (gem, ruby, bundler, etc.)
+(
+cat <<'EOP'
+PATH="/opt/chef/embedded/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
+EOP
+) >> /etc/environment
+. /etc/environment
+
 
 gem install extlib bundler json right_aws pry fog
 
@@ -88,7 +94,7 @@ EOP
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
+<%= { "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index, "environment" => @config[:server].environment }.to_json%>
 EOP
 ) > /etc/chef/first-boot.json
 

data/lib/ironfan/provider/ec2/machine.rb

@@ -108,7 +108,6 @@ module Ironfan
               next unless Ironfan.chef_config[:include_terminated]
               remember machine, :append_id => "terminated:#{machine.id}"
             elsif recall? machine.name
-              raise 'duplicate'
               machine.bogus <<                 :duplicate_machines
               recall(machine.name).bogus <<    :duplicate_machines
               remember machine, :append_id => "duplicate:#{machine.id}"

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-07 00:00:00 Z
+date: 2012-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -130816768739452142
+      hash: -4226427612594670863
       segments: 
       - 0
       version: "0"