ironfan 6.1.6 → 6.1.7

data/lib/chef/knife/bootstrap/{rhel6.3-ironfan.erb → centos6.5-ironfan.erb}

@@ -1,6 +1,6 @@
 bash <<'EOF' || echo "Chef bootstrap failed!"
 
-# This is the RHEL 6 bootstrap script from infochimps' ironfan. It is
+# This is the ubuntu natty bootstrap script from infochimps' ironfan. It is
 # based on opscode's bootstrap script, with the following important differences: 
 #
 # * installs ruby 1.9.2 (not 1.8.7) from source
@@ -12,68 +12,88 @@ set -e
 
 <%= (@config[:verbosity].to_i > 1 ? 'set -v' : '') %>
 
-RUBY_VERSION=1.9.2-p290
-CHEF_VERSION=<%= bootstrap_version_string.gsub(/.*[\s=]/,"") %>
+RUBY_VERSION=1.9.3-p545
+CHEF_VERSION=11.12.4
 
 mkdir -p /tmp/knife-bootstrap
 chmod 700 /tmp/knife-bootstrap 
 cd /tmp/knife-bootstrap
 
 <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
-cat /etc/redhat-release
-
 date > /etc/box_build_time
 
-echo -e "`date` \n\n**** \n**** yum upgrade:\n****\n"
-yum upgrade --assumeyes
-
-echo -e "`date` \n\n**** \n**** Installing base packages:\n****\n"
-yum install --assumeyes make wget 
-yum install --assumeyes git rpm-build rpmdevtools gcc glibc-static zlib-devel libxml2-devel libxslt-devel openssl-devel telnet nc uuid-devel
-if [ ! -d runit-rpm ]; then git clone https://github.com/imeyer/runit-rpm.git; fi
-cd runit-rpm
-./build.sh
-yum install --assumeyes /root/rpmbuild/RPMS/x86_64/runit-*.rpm || true # TODO: Remove this shim
-cd -
-yum remove --assumeyes prelink
+function print_header() {
+	 local message
+	 message="$1"
+	 echo -e "`date` \n\n**** \n**** ${message}\n****\n"
+}
+
+print_header "Creating infochimps yum repository"
+cat >/etc/yum.repos.d/srp-rhel.repo <<EOP
+[dev]
+name=Infochimps Platform - dev
+baseurl=https://s3.amazonaws.com/srp-rhel.chimpy.us/dev/
+gpgcheck=0
+EOP
+
+print_header "yum upgrade"
+# Exclude the kernel, otherwise the initramfs will be replaced,
+# which has a custom, partition-growing feature
+yum upgrade --assumeyes --exclude kernel
+
+print_header "Installing base packages"
+yum install --assumeyes \
+    autoconf \
+    automake \
+    bison \
+    bzip2 \
+    gcc \
+    gcc-c++ \
+    git \
+    glibc \
+    glibc-static \
+    libffi-devel \
+    libtool \
+    libxml2-devel \
+    libxslt-devel \
+    libyaml-devel \
+    make \
+    openssl-devel \
+    patch \
+    qt-all \
+    readline \
+    readline-devel \
+    rpm-build \
+    rpmdevtools \
+    wget \
+    zlib \
+    zlib-devel
+
+# Grr, prevent 'prelink' from mangling our binaries
+# http://www.tsheffler.com/blog/?p=491
+grep ruby /etc/prelink.conf || echo '-b /usr/bin/ruby*' >>/etc/prelink.conf
+
+print_header "Installing ruby version ${RUBY_VERSION}"
+yum install --assumeyes ruby-1.9.3.p545
+
 yum clean all
 
 if [ ! -f /usr/bin/chef-client ]; then
-  echo -e "`date` \n\n**** \n**** Installing ruby version ${RUBY_VERSION}:\n****\n"
-
-  wget ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-${RUBY_VERSION}.tar.gz
-  tar xzf ruby-${RUBY_VERSION}.tar.gz
-  cd ruby-${RUBY_VERSION}
-  ./configure --with-ruby-version=${RUBY_VERSION} --prefix=/usr --program-suffix=${RUBY_VERSION}
-  make -j2
-  make install
-
-  alternatives \
-    --install /usr/bin/ruby ruby /usr/bin/ruby${RUBY_VERSION} 400 \
-    --slave   /usr/bin/ri   ri   /usr/bin/ri${RUBY_VERSION}       \
-    --slave   /usr/bin/irb  irb  /usr/bin/irb${RUBY_VERSION}      \
-    --slave   /usr/bin/erb  erb  /usr/bin/erb${RUBY_VERSION}      \
-    --slave   /usr/bin/gem  gem  /usr/bin/gem${RUBY_VERSION}      \
-    --slave   /usr/share/man/man1/ruby.1.gz ruby.1.gz             \
-    /usr/share/man/man1/ruby${RUBY_VERSION}.1
-
-  echo -e "`date` \n\n**** \n**** Updating rubygems:\n****\n"
-  gem install rubygems-update -v 1.8.5
-
-  echo -e "`date` \n\n**** \n**** Installing chef:\n****\n"
-  gem install net-ssh --no-rdoc --no-ri --version 2.2.2
-  gem install net-ssh-gateway --no-rdoc --no-ri --version 1.1.0
-  gem install net-ssh-multi --no-rdoc --no-ri --version 1.1
-  gem install ohai --no-rdoc --no-ri --version 6.14.0
-  gem install chef --no-rdoc --no-ri --version 10.16.4
+
+  print_header "Updating gems"
+  gem update --system
+
+  print_header "Installing chef"
+  gem install ohai --no-rdoc --no-ri
+  gem install chef --no-rdoc --no-ri --version "$CHEF_VERSION"
   # gems needed for the client.rb or so generically useful you want them at hand
   gem install      --no-rdoc --no-ri extlib bundler json right_aws pry fog
 
 else # no chef-client
-  echo -e "`date` \n\n**** \n**** Chef is present -- skipping apt/ruby/chef installation\n****\n"
+  print_header "Chef is present -- skipping apt/ruby/chef installation"
 fi # end ruby+chef install
 
-echo -e "`date` \n\n**** \n**** Knifing in the chef client config files:\n****\n"
+print_header "Writing chef client config files"
 mkdir -p /etc/chef
 
 <%- if @config[:client_key] %>
@@ -102,12 +122,11 @@ awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
 <% end -%>
 
-echo -e "`date` \n\n**** \n**** Nuking our temp files:\n****\n"
-
+print_header "Deleting temp files"
 cd /tmp
 rm -rf /tmp/knife-bootstrap
 
-echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
+print_header "Creating chef client script"
 
 (
 cat <<'EOP'
@@ -126,8 +145,22 @@ EOP
 mkdir -p /etc/chef/ohai/hints/
 touch /etc/chef/ohai/hints/ec2.json
 
+print_header "Misc chef-client preparation"
+( service chef-client stop >/dev/null 2>&1 ; sleep 1 ; killall chef-client 2>/dev/null ) || true
+mkdir -p /var/log/chef /var/chef /etc/service /etc/sv
 
-echo -e "`date` \n\n**** \n**** Adding chef client nonce script:\n****\n"
+<%- if (@config[:bootstrap_runs_chef_client].to_s == 'true') || (@chef_config.knife[:bootstrap_runs_chef_client].to_s == 'true') %>
+print_header "First run of chef"
+set -e
+<%= start_chef %>
+set +e
+<%- end %>
+
+print_header "Clean up"
+# make locate work good
+updatedb
+
+print_header "Adding chef-client-nonce script"
 
 cat > /etc/init.d/chef-client-nonce <<'EOP'
 #! /bin/sh
@@ -159,21 +192,25 @@ esac
 EOP
 
 mkdir -p /var/log/chef
-mkdir -p /etc/sv
 chmod +x /etc/init.d/chef-client-nonce 
-chkconfig --add chef-client-nonce
-chkconfig --del iptables
-chkconfig --del rh-cloud-firstboot
-chkconfig --add rh-cloud-firstboot
-
-rm /etc/sysconfig/rh-cloud-firstboot
-
-<%- if (@config[:bootstrap_runs_chef_client].to_s == 'true') || (@chef_config.knife[:bootstrap_runs_chef_client].to_s == 'true') %>
-sudo /etc/init.d/chef-client-nonce start
-<%- end %>
-
-
-
-echo -e "`date` \n\n**** \n**** Cleanup:\n****\n"
-cd /
-rm -r /tmp/knife-bootstrap
+chkconfig --level 2345 chef-client-nonce on
+
+print_header "Ensure 'user' user has sudo"
+sed -i -e 's/name: root/name: user/' \
+  -e '/name: user/a \
+    groups: [wheel] \
+    homedir: /local/home/user' /etc/cloud/cloud.cfg
+sed -i -e 's/# \(%wheel.*NOPASSWD.*\)/\1/' /etc/sudoers
+mkdir -p /local/home
+
+print_header "Disable iptables and postfix"
+for svc in iptables ip6tables postfix; do
+    service $svc stop
+    chkconfig --level 2345 $svc off
+done
+
+print_header "Disable SELinux"
+sed -i -e 's/SELINUX=enforcing/SELINUX=disabled/' /etc/selinux/config
+
+print_header "Cluster Chef client bootstrap complete"
+EOF

data/lib/chef/knife/bootstrap/rhel6.5-ironfan.erb

@@ -0,0 +1,240 @@
+bash <<'EOF' || echo "Chef bootstrap failed!"
+
+# This is the ubuntu natty bootstrap script from infochimps' ironfan. It is
+# based on opscode's bootstrap script, with the following important differences: 
+#
+# * installs ruby 1.9.2 (not 1.8.7) from source
+# * upgrades rubygems rather than installing from source
+# * pushes the computer identity into the first-boot.json
+# * installs the chef-client service and kicks off the first run of chef
+
+set -e
+
+<%= (@config[:verbosity].to_i > 1 ? 'set -v' : '') %>
+
+RUBY_VERSION=1.9.3-p545
+CHEF_VERSION=11.12.4
+
+mkdir -p /tmp/knife-bootstrap
+chmod 700 /tmp/knife-bootstrap 
+cd /tmp/knife-bootstrap
+
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+date > /etc/box_build_time
+
+function print_header() {
+	 local message
+	 message="$1"
+	 echo -e "`date` \n\n**** \n**** ${message}\n****\n"
+}
+
+print_header "Subscribing instance to Red Hat subscription"
+if [ -z "<%= Chef::Config[:rhel_subs_useremail] %>" ] \
+   || [ -z "<%= Chef::Config[:rhel_subs_password] %>" ] \
+   || [ -z "<%= Chef::Config[:rhel_subs_pool] %>" ]; then
+
+  echo "You must configure subscription values in knife-org.rb"
+  exit 1
+fi
+
+subscription-manager register \
+  --user=<%= Chef::Config[:rhel_subs_useremail] %> \
+  --pass=<%= Chef::Config[:rhel_subs_password] %> \
+  --auto-attach
+
+subscription-manager attach --pool=<%= Chef::Config[:rhel_subs_pool] %>
+
+subscription-manager repos --disable=*
+subscription-manager repos --enable=rhel-6-server-rpms
+subscription-manager repos --enable=rhel-6-server-optional-rpms
+subscription-manager repos --enable=rhel-6-server-supplementary-rpms
+
+print_header "Creating infochimps yum repository"
+cat >/etc/yum.repos.d/srp-rhel.repo <<EOP
+[dev]
+name=Infochimps Platform - dev
+baseurl=https://s3.amazonaws.com/srp-rhel.chimpy.us/dev/
+gpgcheck=0
+EOP
+
+print_header "yum upgrade"
+# Exclude the kernel, otherwise the initramfs will be replaced,
+# which has a custom, partition-growing feature
+yum upgrade --assumeyes --exclude kernel
+
+print_header "Installing base packages"
+yum install --assumeyes \
+    autoconf \
+    automake \
+    bison \
+    bzip2 \
+    gcc \
+    gcc-c++ \
+    git \
+    glibc \
+    glibc-static \
+    libffi-devel \
+    libtool \
+    libxml2-devel \
+    libxslt-devel \
+    libyaml-devel \
+    make \
+    openssl-devel \
+    patch \
+    qt-all \
+    readline \
+    readline-devel \
+    rpm-build \
+    rpmdevtools \
+    wget \
+    zlib \
+    zlib-devel
+
+# Grr, prevent 'prelink' from mangling our binaries
+# http://www.tsheffler.com/blog/?p=491
+grep ruby /etc/prelink.conf || echo '-b /usr/bin/ruby*' >>/etc/prelink.conf
+
+print_header "Installing ruby version ${RUBY_VERSION}"
+yum install --assumeyes ruby-1.9.3.p545
+
+yum clean all
+
+if [ ! -f /usr/bin/chef-client ]; then
+
+  print_header "Updating gems"
+  gem update --system
+
+  print_header "Installing chef"
+  gem install ohai --no-rdoc --no-ri
+  gem install chef --no-rdoc --no-ri --version "$CHEF_VERSION"
+  # gems needed for the client.rb or so generically useful you want them at hand
+  gem install      --no-rdoc --no-ri extlib bundler json right_aws pry fog
+
+else # no chef-client
+  print_header "Chef is present -- skipping apt/ruby/chef installation"
+fi # end ruby+chef install
+
+print_header "Writing chef client config files"
+mkdir -p /etc/chef
+
+<%- if @config[:client_key] %>
+(
+cat <<'EOP'
+<%= @config[:client_key] %>
+EOP
+) > /tmp/knife-bootstrap/client.pem
+awk NF /tmp/knife-bootstrap/client.pem > /etc/chef/client.pem
+<%- else %>
+(
+cat <<'EOP'
+<%= validation_key %>
+EOP
+) > /tmp/knife-bootstrap/validation.pem
+awk NF /tmp/knife-bootstrap/validation.pem > /etc/chef/validation.pem
+<%- end %>
+
+<% if @chef_config[:encrypted_data_bag_secret] -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+<% end -%>
+
+print_header "Deleting temp files"
+cd /tmp
+rm -rf /tmp/knife-bootstrap
+
+print_header "Creating chef client script"
+
+(
+cat <<'EOP'
+<%= config_content %>
+<%= @config[:computer].chef_client_script_content %>
+EOP
+) > /etc/chef/client.rb
+
+(
+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 %>
+EOP
+) > /etc/chef/first-boot.json
+
+# Ensure that EC2 images are recognized even inside VPC
+mkdir -p /etc/chef/ohai/hints/
+touch /etc/chef/ohai/hints/ec2.json
+
+print_header "Misc chef-client preparation"
+( service chef-client stop >/dev/null 2>&1 ; sleep 1 ; killall chef-client 2>/dev/null ) || true
+mkdir -p /var/log/chef /var/chef /etc/service /etc/sv
+
+<%- if (@config[:bootstrap_runs_chef_client].to_s == 'true') || (@chef_config.knife[:bootstrap_runs_chef_client].to_s == 'true') %>
+print_header "First run of chef"
+set -e
+<%= start_chef %>
+set +e
+<%- end %>
+
+print_header "Clean up"
+# make locate work good
+updatedb
+
+print_header "Adding chef-client-nonce script"
+
+cat > /etc/init.d/chef-client-nonce <<'EOP'
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-client-nonce
+# Required-Start:     $remote_fs $network
+# Required-Stop:
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a single chef-client run.
+### END INIT INFO
+#
+# Copyright (c) 2009-2010 Opscode, Inc, <legal@opscode.com>
+#
+# chef-client         Startup script for chef-client.
+# chkconfig: - 99 02
+# description: starts up chef-client once, at boot
+
+case "$1" in
+  start)
+    /usr/bin/chef-client -L /var/log/chef/client.log
+    exit $?
+    ;;
+  *)
+    echo "Usage: /etc/init.d/chef-client-nonce start" >&2
+    exit 1
+    ;;
+esac
+EOP
+
+mkdir -p /var/log/chef
+chmod +x /etc/init.d/chef-client-nonce 
+chkconfig --level 2345 chef-client-nonce on
+
+print_header "Ensure 'user' user has sudo"
+sed -i -e 's/name: root/name: user/' \
+  -e '/name: user/a \
+    groups: [wheel] \
+    homedir: /local/home/user' /etc/cloud/cloud.cfg
+sed -i -e 's/# \(%wheel.*NOPASSWD.*\)/\1/' /etc/sudoers
+mkdir -p /local/home
+
+print_header "Disable iptables and postfix"
+for svc in iptables ip6tables postfix; do
+    service $svc stop
+    chkconfig --level 2345 $svc off
+done
+
+print_header "Disable SELinux"
+sed -i -e 's/SELINUX=enforcing/SELINUX=disabled/' /etc/selinux/config
+
+print_header "Unregistering instance from Red Hat subscription"
+subscription-manager unregister
+
+print_header "Cluster Chef client bootstrap complete"
+EOF

data/lib/ironfan/broker/computer.rb

@@ -13,14 +13,29 @@ module Ironfan
       field :name,              String
       field :bogus,             Array,  :default => []
 
+      def lookup_snapshot_id(region, snapshot_name) 
+        keys = [region.to_s, snapshot_name.to_s]
+        return Chef::Config[:ec2_snapshot_info][ keys ][:snapshot_id] rescue nil
+      end
+
       def initialize(*args)
         super
         providers[:chef] ||=    Ironfan::Provider::ChefServer
         return unless server
         providers[:iaas]   = server.selected_cloud.provider
         volumes            = server.volumes.values
+        puts server.selected_cloud
+        region = server.selected_cloud.region
+
+
+        # Turn snapshot names into snapshot ids corresponding to the server region
+        volumes.each do |vol|
+          vol.snapshot_id || vol.snapshot_id(lookup_snapshot_id(region, vol.snapshot_name))
+        end
+
         volumes           += server.implied_volumes
         volumes.each{|vol| self.drive vol.name, :volume => vol }
+
       rescue StandardError => err ; err.polish("#{self.class} on '#{args.inspect}'") rescue nil ; raise
       end
 
@@ -365,7 +380,7 @@ module Ironfan
         select do |mach|
           mach.bogus? || (
             # facet match, and index match (or no indexes specified)
-            (mach.server.cluster_name == cluster_name) &&                          
+            (mach.server.cluster_name == cluster_name) &&
             (mach.server.facet_name == facet_name || facet_name.nil?) &&
             (slice_array.include?(mach.server.index) || slice_indexes.nil?))
         end

data/lib/ironfan/dsl/ec2.rb

@@ -334,6 +334,11 @@ Chef::Config[:ec2_flavor_info].merge!({
     'c3.2xlarge'  => { :price => 0.600, :bits => 64, :ram =>  15360, :cores => 8, :core_size => 3.5, :inst_disks => 2, :inst_disk_size =>  80, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
     'c3.4xlarge'  => { :price => 1.200, :bits => 64, :ram =>  30720, :cores => 16, :core_size => 3.4375, :inst_disks => 2, :inst_disk_size =>  160, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
     'c3.8xlarge'  => { :price => 2.400, :bits => 64, :ram =>  61440, :cores => 32, :core_size => 3.375, :inst_disks => 2, :inst_disk_size =>  320, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
+    'r3.large'    => { :price => 0.175, :bits => 64, :ram =>  15360, :cores => 2, :core_size => 3.5,  :inst_disks => 1, :inst_disk_size =>  32, :ephemeral_volumes => 1, :virtualization => 'hvm' },
+    'r3.xlarge'   => { :price => 0.350, :bits => 64, :ram =>  30720, :cores => 4, :core_size => 3.5,  :inst_disks => 1, :inst_disk_size =>  80, :ephemeral_volumes => 1, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'r3.2xlarge'  => { :price => 0.700, :bits => 64, :ram =>  61440, :cores => 8, :core_size => 3.5, :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'r3.4xlarge'  => { :price => 1.400, :bits => 64, :ram =>  124928, :cores => 16, :core_size => 3.5, :inst_disks => 1, :inst_disk_size => 320, :ephemeral_volumes => 1, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'r3.8xlarge'  => { :price => 2.800, :bits => 64, :ram =>  249856, :cores => 32, :core_size => 3.5, :inst_disks => 2, :inst_disk_size =>  320, :ephemeral_volumes => 2, :virtualization => 'hvm' },
     'hs1.8xlarge' => { :price => 4.600, :bits => 64, :ram => 119808, :cores => 16, :core_size => 2.1875, :inst_disks => 24, :inst_disk_size =>  2048, :ephemeral_volumes => 24, :placement_groupable => true, :virtualization => 'hvm' },
     'cr1.8xlarge' =>  { :price => 3.500, :bits => 64, :ram => 249856, :cores => 32, :core_size => 2.75, :inst_disks => 2, :inst_disk_size =>  120, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
     'i2.xlarge'   =>  { :price => 0.853, :bits => 64, :ram => 31232, :cores => 4, :core_size => 3.5, :inst_disks => 1, :inst_disk_size =>  800, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized =>  500 },

data/lib/ironfan/dsl/volume.rb

@@ -24,17 +24,6 @@ module Ironfan
       magic     :snapshot_name,         String
       magic     :tags,                  Hash,     :default => {}
 
-      VOLUME_IDS ||= {}
-      VOLUME_IDS.merge!({
-                            :blank_xfs             => 'snap-d9c1edb1',
-                            :blank_xfs_tokyo       => 'snap-049d1921',
-                            :blank_xfs_california  => 'snap-514b5c5a', # us-west-1
-                        })
-
-      def snapshot_id(*)
-        Ironfan.todo("CODE SMELL: EBS specific information in Dsl::Volume::VOLUME_IDS")
-        super || VOLUME_IDS[snapshot_name]
-      end
     end
 
     class RaidGroup < Volume

data/lib/ironfan/provider.rb

@@ -213,6 +213,11 @@ module Ironfan
       # A Machine lives and dies with its Computer
       def self.shared?()        false;                   end
 
+      # FIXME: users_groups only in 7.4, not 6.3 ... including
+      #   this module breaks on our Ubuntu image (with cloud-init 6.3)
+      # note that in the sed statement in the bootcmd below,
+      #   sed expects some characters to be escaped \(\) etc.
+      #   then yaml needs \ inside double-quotes escaped as \x5c
       def self.cloud_init_user_data(computer) 
         return <<EOF
 #cloud-config
@@ -225,18 +230,19 @@ output: {all: '| tee -a /var/log/cloud-init-output.log'}
 # Set our hostname
 manage_etc_hosts: True
 
-cloud_init_modules:
- - bootcmd
- - resizefs
- - set_hostname
- - update_hostname
- - update_etc_hosts
- - ca-certs
- - rsyslog
- - ssh
-
 fqdn: #{computer.server.fqdn}
 
+cloud_init_modules:
+  - bootcmd
+  - resizefs
+  - set_hostname
+  - update_hostname
+  - update_etc_hosts
+  - ca-certs
+  - rsyslog
+  - users-groups
+  - ssh
+
 bootcmd:
   # note that writefiles is not supported on precise...
   - |
@@ -248,8 +254,13 @@ bootcmd:
 #{computer.private_key.split("\n").map {|l| "      "+l}.join("\n")}
       EOF
       domainname #{computer.server.fqdn}
-      IP=`curl 169.254.169.254/latest/meta-data/local-ipv4`;sed -i -e "s/127\.0\.1\.1/$IP/" /etc/cloud/templates/hosts.tmpl
- 
+      IP=`curl 169.254.169.254/latest/meta-data/local-ipv4`
+      [ -f /etc/cloud/templates/hosts.tmpl ] && sed -i -e "s/127\x5c.0\x5c.1\x5c.1/$IP/" /etc/cloud/templates/hosts.tmpl
+      [ -f /etc/cloud/templates/hosts.debian.tmpl ] && sed -i -e "s/127\x5c.0\x5c.1\x5c.1/$IP/" /etc/cloud/templates/hosts.debian.tmpl
+      [ -f /etc/cloud/templates/hosts.redhat.tmpl ] && sed -i -e "/::1/d" -e "s/^[0-9]*\x5c.[0-9]*\x5c.[0-9]*\x5c.[0-9]*\x5c( .*fqdn.*\x5c)/$IP\x5c1/" /etc/cloud/templates/hosts.redhat.tmpl
+
+# This is understood to fail gracefully during image creation (before 
+# knife cluster bootstrap burninator...) due to Chef not installed yet.
 chef:
  install_type: "packages"
  force_install: false
@@ -268,6 +279,7 @@ chef:
     We don't need no stinking validators.
 EOF
       end
+
     end
   end
 end

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

@@ -226,8 +226,13 @@ module Ironfan
           errors['Missing client']      = info            unless computer.client?
           errors['Missing private_key'] = computer.client unless computer.private_key
           #
-          all_asserted_regions = [Ec2.connection.region, cloud.region, Chef::Config[:knife][:region], Ironfan.chef_config[:region]].compact.uniq
-          errors["mismatched region"] = all_asserted_regions unless all_asserted_regions.count == 1
+          asserted_regions = {
+            :ec2_connection => Ec2.connection.region,
+            :cloud => cloud.region,
+            :knife => Chef::Config[:knife][:region],
+            :chef_config => Ironfan.chef_config[:region]
+          }
+          errors["mismatched region"] = asserted_regions unless asserted_regions.values.compact.uniq.count == 1
           #
           errors
         end

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.1.6'
+  VERSION = '6.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.1.6
+  version: 6.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -183,9 +183,9 @@ files:
 - config/ubuntu12.04-ironfan.erb
 - ironfan.gemspec
 - lib/chef/cluster_knife.rb
-- lib/chef/knife/bootstrap/centos6.2-ironfan.erb
+- lib/chef/knife/bootstrap/centos6.5-ironfan.erb
 - lib/chef/knife/bootstrap/chef-full-ironfan.erb
-- lib/chef/knife/bootstrap/rhel6.3-ironfan.erb
+- lib/chef/knife/bootstrap/rhel6.5-ironfan.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb
 - lib/chef/knife/bootstrap/ubuntu12.04-ironfan.erb
 - lib/chef/knife/cluster_bootstrap.rb
@@ -322,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4249485048014092893
+      hash: 159548640143306131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4249485048014092893
+      hash: 159548640143306131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/chef/knife/bootstrap/centos6.2-ironfan.erb

@@ -1,158 +0,0 @@
-bash <<'EOF' || echo "Chef bootstrap failed!"
-
-# This is the ubuntu natty bootstrap script from infochimps' ironfan. It is
-# based on opscode's bootstrap script, with the following important differences: 
-#
-# * installs ruby 1.9.2 (not 1.8.7) from source
-# * upgrades rubygems rather than installing from source
-# * pushes the computer identity into the first-boot.json
-# * installs the chef-client service and kicks off the first run of chef
-
-set -e
-
-<%= (@config[:verbosity].to_i > 1 ? 'set -v' : '') %>
-
-RUBY_VERSION=1.9.2-p290
-CHEF_VERSION=<%= bootstrap_version_string.gsub(/.*[\s=]/,"") %>
-
-mkdir -p /tmp/knife-bootstrap
-chmod 700 /tmp/knife-bootstrap 
-cd /tmp/knife-bootstrap
-
-<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
-cat /etc/centos-release
-
-date > /etc/box_build_time
-
-echo -e "`date` \n\n**** \n**** yum upgrade:\n****\n"
-yum upgrade --assumeyes
-
-echo -e "`date` \n\n**** \n**** Installing base packages:\n****\n"
-yum install --assumeyes make wget 
-yum install --assumeyes git rpm-build rpmdevtools gcc glibc-static zlib-devel libxml2-devel libxslt-devel openssl-devel 
-if [ ! -d runit-rpm ]; then git clone https://github.com/imeyer/runit-rpm.git; fi
-cd runit-rpm
-./build.sh
-yum install --assumeyes /root/rpmbuild/RPMS/x86_64/runit-*.rpm || true # TODO: Remove this shim
-cd -
-
-yum clean all
-
-if [ ! -f /usr/bin/chef-client ]; then
-  echo -e "`date` \n\n**** \n**** Installing ruby version ${RUBY_VERSION}:\n****\n"
-
-  wget ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-${RUBY_VERSION}.tar.gz
-  tar xzf ruby-${RUBY_VERSION}.tar.gz
-  cd ruby-${RUBY_VERSION}
-  ./configure --with-ruby-version=${RUBY_VERSION} --prefix=/usr --program-suffix=${RUBY_VERSION}
-  make -j2
-  make install
-
-  alternatives \
-    --install /usr/bin/ruby ruby /usr/bin/ruby${RUBY_VERSION} 400 \
-    --slave   /usr/bin/ri   ri   /usr/bin/ri${RUBY_VERSION}       \
-    --slave   /usr/bin/irb  irb  /usr/bin/irb${RUBY_VERSION}      \
-    --slave   /usr/bin/erb  erb  /usr/bin/erb${RUBY_VERSION}      \
-    --slave   /usr/bin/gem  gem  /usr/bin/gem${RUBY_VERSION}      \
-    --slave   /usr/share/man/man1/ruby.1.gz ruby.1.gz             \
-    /usr/share/man/man1/ruby${RUBY_VERSION}.1
-
-  echo -e "`date` \n\n**** \n**** Updating rubygems:\n****\n"
-  gem update --system
-
-  echo -e "`date` \n\n**** \n**** Installing chef:\n****\n"
-  gem install ohai --no-rdoc --no-ri
-  gem install chef --no-rdoc --no-ri <%= bootstrap_version_string %>
-  # gems needed for the client.rb or so generically useful you want them at hand
-  gem install      --no-rdoc --no-ri extlib bundler json right_aws pry fog
-
-else # no chef-client
-  echo -e "`date` \n\n**** \n**** Chef is present -- skipping apt/ruby/chef installation\n****\n"
-fi # end ruby+chef install
-
-echo -e "`date` \n\n**** \n**** Knifing in the chef client config files:\n****\n"
-mkdir -p /etc/chef
-
-<%- if @config[:client_key] %>
-(
-cat <<'EOP'
-<%= @config[:client_key] %>
-EOP
-) > /tmp/knife-bootstrap/client.pem
-awk NF /tmp/knife-bootstrap/client.pem > /etc/chef/client.pem
-<%- else %>
-(
-cat <<'EOP'
-<%= validation_key %>
-EOP
-) > /tmp/knife-bootstrap/validation.pem
-awk NF /tmp/knife-bootstrap/validation.pem > /etc/chef/validation.pem
-<%- end %>
-
-<% if @chef_config[:encrypted_data_bag_secret] -%>
-(
-cat <<'EOP'
-<%= encrypted_data_bag_secret %>
-EOP
-) > /tmp/encrypted_data_bag_secret
-awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
-rm /tmp/encrypted_data_bag_secret
-<% end -%>
-
-echo -e "`date` \n\n**** \n**** Nuking our temp files:\n****\n"
-
-cd /tmp
-rm -rf /tmp/knife-bootstrap
-
-echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
-
-(
-cat <<'EOP'
-<%= config_content %>
-<%= @config[:computer].chef_client_script_content %>
-EOP
-) > /etc/chef/client.rb
-
-(
-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 %>
-EOP
-) > /etc/chef/first-boot.json
-
-echo -e "`date` \n\n**** \n**** Adding chef client runit scripts:\n****\n"
-( service chef-client stop >/dev/null 2>&1 ; sleep 1 ; killall chef-client 2>/dev/null ) || true
-mkdir -p /var/log/chef /var/chef /etc/service /etc/sv/chef-client/{log/main,supervise} 
-
-cat > /etc/sv/chef-client/log/run <<'EOP'
-#!/bin/bash
-exec svlogd -tt ./main
-EOP
-
-cat > /etc/sv/chef-client/run <<'EOP'
-#!/bin/bash
-exec 2>&1
-exec /usr/bin/env chef-client -i 43200 -s 20 -L /var/log/chef/client.log
-EOP
-
-chmod +x  /etc/sv/chef-client/log/run /etc/sv/chef-client/run
-ln -nfs /sbin/sv /etc/init.d/chef-client
-
-service chef-client stop >/dev/null 2>&1 || true
-
-<%- if (@config[:bootstrap_runs_chef_client].to_s == 'true') || (@chef_config.knife[:bootstrap_runs_chef_client].to_s == 'true') %>
-echo -e "`date` \n\n**** \n**** First run of chef:\n****\n"
-set -e
-<%= start_chef %>
-set +e
-<%- end %>
-
-echo -e "`date` \n\n**** \n**** Cleanup:\n****\n"
-# make locate work good
-updatedb
-
-echo -e "`date` \n\n**** \n**** Enabling chef client service:\n****\n"
-ln -nfs /etc/sv/chef-client /etc/service/chef-client
-service chef-client start
-
-echo -e "`date` \n\n**** \n**** Cluster Chef client bootstrap complete\n****\n"
-EOF