Support for cluster compute nodes, and injection of an HVM-virtualiza…

…tion AMI that mostly works. Have initial work to allow placement group specification, but unfortunately Fog is not passign things through correctly, will have to dive in and figure that out. sigh.

lib/chef/knife/cluster_kick.rb

@@ -42,6 +42,14 @@ class ClusterKick < Chef::Knife::ClusterSsh
         :description => "Where to find the pid file. Typically /var/run/chef/client.pid (init.d) or /etc/sv/chef-client/supervise/pid (runit)",
         :default     => "/etc/sv/chef-client/supervise/pid"
 
+      def run
+        @name_args = [ @name_args.join('-') ]
+        config[:display_target] = true
+        script = Erubis::Eruby.new(KICKSTART_SCRIPT).result(:config => config)
+        @name_args[1] = script
+        super
+      end
+
       unless defined?(KICKSTART_SCRIPT)
         KICKSTART_SCRIPT = <<EOF
 #!/bin/bash
@@ -83,13 +91,6 @@ class ClusterKick < Chef::Knife::ClusterSsh
 EOF
       end
 
-      def run
-        @name_args = [ @name_args.join('-') ]
-        script = Erubis::Eruby.new(KICKSTART_SCRIPT).result(:config => config)
-        @name_args[1] = script
-        super
-      end
-
     end
   end
 end

lib/ironfan/chef_layer.rb

@@ -30,8 +30,9 @@ module DryRunnable
     # Run given block unless in dry_run mode (Ironfan.chef_config[:dry_run]
     # is true)
     def unless_dry_run
-      if Ironfan.chef_config[:dry_run]
+      if Ironfan.dry_run?
         ui.info("      ... but not really (#{ui.color("dry run", :bold, :yellow)} for server #{name})")
+        return nil
       else
         yield
       end